[Pkg-samba-maint] [Git][samba-team/samba][master] 3 commits: Ensure systemd-tmpfiles is called before testparm (Closes: #975422)

[Mathieu Parent]

Mathieu Parent pushed to branch master at Debian Samba Team / samba


Commits:
0c3b2056 by Mathieu Parent at 2020-11-22T10:40:43+01:00
Ensure systemd-tmpfiles is called before testparm (Closes: #975422)

- - - - -
dfb7358e by Mathieu Parent at 2020-11-22T10:44:46+01:00
Only check configuration on configure step

Not on triggered, abort-upgrade, abort-remove, abort-deconfigure, abort-remove

- - - - -
0414859a by Mathieu Parent at 2020-11-22T10:45:07+01:00
Release 2:4.13.2+dfsg-3

- - - - -


2 changed files:

- debian/changelog
- debian/samba-common-bin.postinst


Changes:

=====================================
debian/changelog
=====================================
@@ -1,3 +1,10 @@
+samba (2:4.13.2+dfsg-3) unstable; urgency=medium
+
+  * Ensure systemd-tmpfiles is called before testparm (Closes: #975422)
+  * Only check configuration on configure step
+
+ -- Mathieu Parent <sathieu at debian.org>  Sun, 22 Nov 2020 10:44:51 +0100
+
 samba (2:4.13.2+dfsg-2) unstable; urgency=medium
 
   * Upload to unstable 


=====================================
debian/samba-common-bin.postinst
=====================================
@@ -2,15 +2,20 @@
 
 set -e
 
-SERVER_ROLE=`samba-tool testparm --parameter-name="server role"  2>/dev/null | tail -1`
-if [ "$SERVER_ROLE" = "active directory domain controller" ]; then
-    echo "Checking smb.conf with samba-tool"
-    samba-tool testparm -d1 --suppress-prompt > /dev/null
-    echo "Done"
-else
-    echo "Checking smb.conf with testparm"
-    testparm -d1 --suppress-prompt > /dev/null
-    echo "Done"
-fi
+# systemd-tmpfiles should be called before testparm
+# See https://bugs.debian.org/975422
 
 #DEBHELPER#
+
+if [ "$1" = "configure" ] ; then
+    SERVER_ROLE=`samba-tool testparm --parameter-name="server role"  2>/dev/null | tail -1`
+    if [ "$SERVER_ROLE" = "active directory domain controller" ]; then
+        echo "Checking smb.conf with samba-tool"
+        samba-tool testparm -d1 --suppress-prompt > /dev/null
+        echo "Done"
+    else
+        echo "Checking smb.conf with testparm"
+        testparm -d1 --suppress-prompt > /dev/null
+        echo "Done"
+    fi
+fi



View it on GitLab: https://salsa.debian.org/samba-team/samba/-/compare/7a1fc7281cad2ba78d65c256c18b6072a1079a02...0414859a7b754d1b34f841a6ad7af93740d45a81

-- 
View it on GitLab: https://salsa.debian.org/samba-team/samba/-/compare/7a1fc7281cad2ba78d65c256c18b6072a1079a02...0414859a7b754d1b34f841a6ad7af93740d45a81
You're receiving this email because of your account on salsa.debian.org.


-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://alioth-lists.debian.net/pipermail/pkg-samba-maint/attachments/20201122/3f8b3f22/attachment-0001.html>