From 33bbf74055639e025e141ca0fcb28cc71f1ef544 Mon Sep 17 00:00:00 2001 From: Michal Lazo Date: Tue, 17 Jun 2025 22:37:57 +0200 Subject: [PATCH 1/2] fix: update to wsdd2 --- Dockerfile | 2 +- src/samba.sh | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Dockerfile b/Dockerfile index f48df31..56f210a 100644 --- a/Dockerfile +++ b/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 \ diff --git a/src/samba.sh b/src/samba.sh index 10960b3..43a83b8 100644 --- a/src/samba.sh +++ b/src/samba.sh @@ -129,7 +129,7 @@ if [[ "${BOOT_MODE:-}" == "windows_legacy" ]]; then fi else # Enable Web Service Discovery on Vista and up - wsdd -i "$interface" -p -n "$hostname" & + wsdd2 -i "$interface" -H "$hostname" -N "$hostname" & echo "$!" > /var/run/wsdd.pid fi From 6118cc235170a9d98be11b313074dc8fa2766db5 Mon Sep 17 00:00:00 2001 From: Michal Lazo Date: Wed, 18 Jun 2025 22:24:22 +0200 Subject: [PATCH 2/2] fix: delay wsdd2 start --- src/power.sh | 3 +-- src/samba.sh | 3 +-- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/src/power.sh b/src/power.sh index 9ca5583..136c303 100644 --- a/src/power.sh +++ b/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" diff --git a/src/samba.sh b/src/samba.sh index 43a83b8..ab037ea 100644 --- a/src/samba.sh +++ b/src/samba.sh @@ -129,8 +129,7 @@ if [[ "${BOOT_MODE:-}" == "windows_legacy" ]]; then fi else # Enable Web Service Discovery on Vista and up - wsdd2 -i "$interface" -H "$hostname" -N "$hostname" & - echo "$!" > /var/run/wsdd.pid + (sleep 30; wsdd2 -i "$interface" -N "$hostname" -d) & fi return 0