Update of /etc/init.d/grml-reboot and debian/changelog

[grml-etc.git] / debian / preinst

diff --git a/debian/preinst b/debian/preinst
index 6fc8ab4..615ed55 100755 (executable)
--- a/debian/preinst
+++ b/debian/preinst
@@ -4,7 +4,7 @@
 # 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: Don Nov 02 20:58:57 CET 2006 [mika]
 ################################################################################
 
 set -e
@@ -13,8 +13,7 @@ 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_DIVERT5="windowlab.menurc"
 
 divert_gen() {
     DEXT=${3:-original}
@@ -52,9 +51,6 @@ case "$1" in
                 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
         done
 
@@ -82,6 +78,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