Merge 6118cc2351 into 50f6467dea

Dockerfile

@@ -10,7 +10,7 @@ ARG DEBCONF_NONINTERACTIVE_SEEN="true"
 RUN set -eu && \
     apt-get update && \
     apt-get --no-install-recommends -y install \
-        wsdd \
+        wsdd2 \
         samba \
         wimtools \
         dos2unix \

src/power.sh

@@ -104,8 +104,7 @@ finish() {
   pid="/var/run/tpm.pid"
   [ -s "$pid" ] && pKill "$(<"$pid")"
 
-  pid="/var/run/wsdd.pid"
-  [ -s "$pid" ] && pKill "$(<"$pid")"
+  fKill "wsdd2"
 
   fKill "smbd"
 

src/samba.sh

@@ -129,8 +129,7 @@ if [[ "${BOOT_MODE:-}" == "windows_legacy" ]]; then
   fi
 else
   # Enable Web Service Discovery on Vista and up
-  wsdd -i "$interface" -p -n "$hostname" &
-  echo "$!" > /var/run/wsdd.pid
+  (sleep 30; wsdd2 -i "$interface" -N "$hostname" -d) &
 fi
 
 return 0