X-Git-Url: http://git.grml.org/?a=blobdiff_plain;f=debian%2Fpreinst;h=b9f427924752f94f381661585d82947af49e803d;hb=e49c72d6148f060006f78eb2c55f7e4e6552454e;hp=6fc8ab407c98afc49be1486087b7bfc43047e914;hpb=619e0de06b76617ae33acdeafc455210dc58d729;p=grml-etc.git

diff --git a/debian/preinst b/debian/preinst
index 6fc8ab4..b9f4279 100755
--- a/debian/preinst
+++ b/debian/preinst
@@ -4,17 +4,14 @@
 # Authors:       grml-team (grml.org), (c) Michael Prokop <mika@grml.org>
 # Bug-Reports:   see http://grml.org/bugs/
 # License:       This file is licensed under the GPL v2.
-# Latest change: Don Okt 12 17:39:16 CEST 2006 [mika]
+# Latest change: Mon Feb 04 15:32:00 CET 2008 [mika]
 ################################################################################
 
 set -e
 
-TO_DIVERT1="login.config mgetty.config"
-TO_DIVERT2="ssh"
-TO_DIVERT3="kismet.conf"
-TO_DIVERT4="wlan-ng.conf"
-TO_DIVERT5="smb.conf"
-TO_DIVERT6="windowlab.menurc"
+TO_DIVERT1="ssh"
+TO_DIVERT2="kismet.conf"
+TO_DIVERT3="wlan-ng.conf"
 
 divert_gen() {
     DEXT=${3:-original}
@@ -29,9 +26,10 @@ rm_conffile() {
 
     if [ -e "$CONFFILE" ]; then
         md5sum="`md5sum \"$CONFFILE\" | sed -e \"s/ .*//\"`"
-        old_md5sum="`sed -n -e \"/^Conffiles:/,/^[^ ]/{\\\\' $CONFFILE'{s/.* //;p}}\" /var/lib/dpkg/status`"
+        old_md5sum="`dpkg-query -W -f='${Conffiles}' grml-etc | sed -n -e \"\\\\' $CONFFILE'{s/ obsolete$//;s/.* //p}\"`"
         if [ "$md5sum" != "$old_md5sum" ]; then
-            echo "Conffile $CONFFILE has been modified, temporary moving to $CONFFILE.dpkg-bak ..."
+            echo "Obsolete conffile $CONFFILE has been modified by you."
+            echo "Saving as $CONFFILE.dpkg-bak ..."
             mv -f "$CONFFILE" "$CONFFILE".dpkg-bak
         fi
     fi
@@ -40,22 +38,15 @@ rm_conffile() {
 case "$1" in
    install|upgrade)
         for cmd in $TO_DIVERT1; do
-                divert_gen $cmd /etc/mgetty
+            divert_gen $cmd /etc/init.d
         done
+
         for cmd in $TO_DIVERT2; do
-                divert_gen $cmd /etc/init.d
+            divert_gen $cmd /etc/kismet
         done
+
         for cmd in $TO_DIVERT3; do
-                divert_gen $cmd /etc/kismet
-        done
-        for cmd in $TO_DIVERT4; do
-                divert_gen $cmd /etc/pcmcia
-        done
-        for cmd in $TO_DIVERT5; do
-                divert_gen $cmd /etc/samba
-        done
-        for cmd in $TO_DIVERT6; do
-                divert_gen $cmd /etc/X11/windowlab
+            divert_gen $cmd /etc/pcmcia
         done
 
         # did I mention that dpkg-divert sucks?
@@ -82,6 +73,11 @@ case "$1" in
            dpkg-divert --quiet --package grml-etc --remove --rename --divert /etc/skel/.zshrc.original /etc/skel/.zshrc
         fi
 
+        if dpkg-divert --list /etc/samba/smb.conf | grep -q 'grml-etc$' ; then
+           [ -f /etc/samba/smb.conf.original ] && rm /etc/samba/smb.conf.original
+           dpkg-divert --quiet --package grml-etc --remove --rename --divert /etc/samba/smb.conf.original /etc/samba/smb.conf
+        fi
+
      ;;
    *)
      echo "preinst called with unknown argument $1" >&2