[02/54] samba: Migrate older backups too and use standard update mechasism

Message ID 20201013160812.27754-2-michael.tremer@ipfire.org
State Accepted
Commit 2bed30b224e3f5d3f3628bf2401a798b657cc862
Headers show
Series [01/54] samba: Migrate configuration from Samba 3.6 to 4.x | expand

Commit Message

Michael Tremer Oct. 13, 2020, 4:07 p.m. UTC
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
---
 src/paks/samba/install.sh |  7 +++++++
 src/paks/samba/update.sh  | 21 +++------------------
 2 files changed, 10 insertions(+), 18 deletions(-)

Patch

diff --git a/src/paks/samba/install.sh b/src/paks/samba/install.sh
index b7a2fc1cc..55525d08a 100644
--- a/src/paks/samba/install.sh
+++ b/src/paks/samba/install.sh
@@ -32,4 +32,11 @@  fi
 
 extract_files
 restore_backup ${NAME}
+
+# Migrate configuration from Samba 3.6 to 4.x
+sed -i /var/ipfire/samba/smb.conf \
+	-e "/^display charset =/d" \
+	-e "s/^security = share$/security = user/"
+
+# Start the service
 /usr/local/bin/sambactrl smbstart
diff --git a/src/paks/samba/update.sh b/src/paks/samba/update.sh
index 76875657b..99776659c 100644
--- a/src/paks/samba/update.sh
+++ b/src/paks/samba/update.sh
@@ -17,26 +17,11 @@ 
 # along with IPFire; if not, write to the Free Software                    #
 # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA #
 #                                                                          #
-# Copyright (C) 2010 IPFire-Team <info@ipfire.org>.                        #
+# Copyright (C) 2007-2020 IPFire-Team <info@ipfire.org>.                   #
 #                                                                          #
 ############################################################################
 #
 . /opt/pakfire/lib/functions.sh
+extract_backup_includes
 ./uninstall.sh
-
-# If the wbpriv group does not exist yet, then create it and put squid
-# into it.
-if ! getent group wbpriv >/dev/null; then
-	groupadd -g 88 wbpriv
-	usermod -a -G wbpriv squid
-fi
-
-extract_files
-restore_backup ${NAME}
-
-# Migrate configuration from Samba 3.6 to 4.x
-sed -i /var/ipfire/samba/smb.conf \
-	-e "/^display charset =/d" \
-	-e "s/^security = share$/security = user/"
-
-/usr/local/bin/sambactrl smbstart
+./install.sh