From 48b59ef08f1efc628acf96b1786c6cbd6c2870311b541b8d5d59adb7eaa2f405 Mon Sep 17 00:00:00 2001 From: Herbert Graeber Date: Thu, 7 May 2020 19:16:51 +0000 Subject: [PATCH] Accepting request 801369 from home:hgraeber:branches:network - Fix handling of WSDD_WORKGROUP - Let WSDD_DOMAIN override WSDD_WORKGROUP OBS-URL: https://build.opensuse.org/request/show/801369 OBS-URL: https://build.opensuse.org/package/show/network/wsdd?expand=0&rev=2 --- sysconfig.wsdd | 2 +- wsdd-init.sh | 6 ++---- wsdd.changes | 6 ++++++ 3 files changed, 9 insertions(+), 5 deletions(-) diff --git a/sysconfig.wsdd b/sysconfig.wsdd index 28d00ef..494c328 100644 --- a/sysconfig.wsdd +++ b/sysconfig.wsdd @@ -4,7 +4,7 @@ ## Default: "" ## ServiceRestart:·wsdd # Windows domain -# If empty use the machines domain +# If empty use the machines domain, overrides WSDD_WORKGROUP WSDD_DOMAIN="" ## Type: string diff --git a/wsdd-init.sh b/wsdd-init.sh index 8374bcf..a5c553f 100644 --- a/wsdd-init.sh +++ b/wsdd-init.sh @@ -7,9 +7,7 @@ fi if [ "${WSDD_DOMAIN}" != "" ]; then WSDD_DOMAIN="-d \"${WSDD_DOMAIN}\"" -fi - -if [ "${WSDD_WORKGROUP}" != "" ]; then +elif [ "${WSDD_WORKGROUP}" != "" ]; then WSDD_DOMAIN="-w \"${WSDD_WORKGROUP}\"" fi @@ -27,5 +25,5 @@ fi install -o wsdd -g wsdd -p 0700 -d /run/sysconfig -echo "WSDD_ARGS=${WSDD_HOSTNAME} ${WSDD_WORKGROUP} ${WSDD_DOMAIN} ${WSDD_INTERFACE_ARGS} \ +echo "WSDD_ARGS=${WSDD_HOSTNAME} ${WSDD_DOMAIN} ${WSDD_INTERFACE_ARGS} \ ${WSDD_ARGS}" >/run/sysconfig/wsdd diff --git a/wsdd.changes b/wsdd.changes index b92c8fa..74b3430 100644 --- a/wsdd.changes +++ b/wsdd.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Thu May 7 18:54:30 UTC 2020 - Herbert Graeber + +- Fix handling of WSDD_WORKGROUP +- Let WSDD_DOMAIN override WSDD_WORKGROUP + ------------------------------------------------------------------- Sun Apr 26 20:24:03 UTC 2020 - Herbert Graeber