[Pkg-samba-maint] r1766 - trunk/samba/debian

[vorlon at alioth.debian.org]

Author: vorlon
Date: 2008-03-14 06:32:10 +0000 (Fri, 14 Mar 2008)
New Revision: 1766

Modified:
   trunk/samba/debian/changelog
   trunk/samba/debian/samba-common.postinst
Log:
* Add an additional sed command to samba-common.postinst to cleverly
  pick up any shares that have been appended to the default smb.conf 
  and exclude them from the ucf diff.

Modified: trunk/samba/debian/changelog
===================================================================
--- trunk/samba/debian/changelog	2008-03-14 05:54:48 UTC (rev 1765)
+++ trunk/samba/debian/changelog	2008-03-14 06:32:10 UTC (rev 1766)
@@ -19,6 +19,9 @@
       options, rather than historical synonyms
     - clarify the comment for 'max log size'.
     Thanks to Chuck Short and Richard Laager.
+  * Add an additional sed command to samba-common.postinst to cleverly
+    pick up any shares that have been appended to the default smb.conf 
+    and exclude them from the ucf diff.
 
  -- Christian Perrier <bubulle at debian.org>  Sun, 09 Mar 2008 22:45:01 +0100
 

Modified: trunk/samba/debian/samba-common.postinst
===================================================================
--- trunk/samba/debian/samba-common.postinst	2008-03-14 05:54:48 UTC (rev 1765)
+++ trunk/samba/debian/samba-common.postinst	2008-03-14 06:32:10 UTC (rev 1766)
@@ -108,6 +108,13 @@
 
 cp /usr/share/samba/smb.conf "$NEWFILE"
 configure_smb_conf "$NEWFILE"
+
+if [ -e "$CONFIG" ]; then
+	sed -e '1,/^[;#[:space:]]*\[cdrom\]/ { d }
+		1,/^[[:space:]]*\[/ { /^[^[]/d; /^$/d }
+	' "$CONFIG" >> "$NEWFILE"
+fi
+
 ucf --three-way --debconf-ok "$NEWFILE" "$CONFIG"
 ucfr samba-common "$CONFIG"