From: Adolf Belka <adolf.belka@ipfire.org>
Date: Mon, 18 Mar 2024 18:43:14 +0000 (+0100)
Subject: wsdd: Update install and uninstall pak files
X-Git-Tag: v2.29-core185~46
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=4913c14477214f285ade2dfc304baaa6fbfaf2d1;p=ipfire-2.x.git

wsdd: Update install and uninstall pak files

- As wsdd is now started by samba when it is started then the wsdd install and uninstall
   paks no longer need to create the symlinks for starting and stopping wsdd and no longer
   need the start_service and stop_service commands in the paks.

Fixes: bug#13445
Tested-by: Adolf Belka <adolf.belka@ipfire.org>
Signed-off-by: Adolf Belka <adolf.belka@ipfire.org>
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
---

diff --git a/src/paks/wsdd/install.sh b/src/paks/wsdd/install.sh
index 181b84eb99..12fde4802e 100644
--- a/src/paks/wsdd/install.sh
+++ b/src/paks/wsdd/install.sh
@@ -24,7 +24,7 @@
 . /opt/pakfire/lib/functions.sh
 
 # If the wsdd user does not exist yet, then create it and add to wsdd group.
-if ! getent user wsdd >/dev/null; then
+if ! getent passwd wsdd >/dev/null; then
 	useradd -r -U -d / -s /bin/false -c "wsdd user" wsdd
 	usermod -a -G wsdd wsdd
 fi
@@ -32,9 +32,4 @@ fi
 extract_files
 restore_backup ${NAME}
 
-# Create startlinks
-ln -sf ../init.d/wsdd /etc/rc.d/rc0.d/K35wsdd
-ln -sf ../init.d/wsdd /etc/rc.d/rc3.d/S65wsdd
-ln -sf ../init.d/wsdd /etc/rc.d/rc6.d/K35wsdd
-start_service ${NAME}
 exit 0
diff --git a/src/paks/wsdd/uninstall.sh b/src/paks/wsdd/uninstall.sh
index 4c52ee281e..9dc5202f47 100644
--- a/src/paks/wsdd/uninstall.sh
+++ b/src/paks/wsdd/uninstall.sh
@@ -22,9 +22,6 @@
 ############################################################################
 #
 . /opt/pakfire/lib/functions.sh
-stop_service ${NAME}
 make_backup ${NAME}
 remove_files
-# Remove all start links.
-rm -rf /etc/rc.d/rc*.d/*wsdd
 exit 0