summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorvorlon <vorlon@alioth.debian.org>2008-03-14 06:40:33 +0000
committervorlon <vorlon@alioth.debian.org>2008-03-14 06:40:33 +0000
commit09f7f657b6e2725b16bebc571bc842c553e4cd20 (patch)
treec14ee4cfa9c2e04790b3982ef26189fc604a1d0b
parent4740482835b1567ef91caa2a70dad6322bba3e77 (diff)
downloadsamba-09f7f657b6e2725b16bebc571bc842c553e4cd20.tar.gz
apply the same sed command from the previous commit to upgrades from pre-ucf
versions git-svn-id: svn://svn.debian.org/svn/pkg-samba/trunk/samba/debian@1767 fc4039ab-9d04-0410-8cac-899223bdd6b0
-rw-r--r--samba-common.postinst7
1 files changed, 7 insertions, 0 deletions
diff --git a/samba-common.postinst b/samba-common.postinst
index 3dcbe19ad5..d29b07e57e 100644
--- a/samba-common.postinst
+++ b/samba-common.postinst
@@ -103,6 +103,13 @@ if [ -n "$2" ] && dpkg --compare-versions "$2" lt 3.0.28-3; then
cp "$TEMPLATE" "$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"
fi