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

diff --git a/debian/preinst b/debian/preinst
index 6fc8ab4..aaebc30 100755
--- 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
 
@@ -68,9 +64,9 @@ case "$1" in
            fi
         fi
 
-        # move files from package grml-etc to grml-etc-core
+        # move files from package grml-etc to grml-etc-core / remove them at all
         for file in /etc/zsh/zlogin /etc/zsh/zprofile /etc/zsh/zshenv /etc/zsh/zshrc \
-                    /etc/zsh/zshrc  /etc/zsh/zlogout  /etc/vim/vimrc ; do
+                    /etc/zsh/zshrc  /etc/zsh/zlogout  /etc/vim/vimrc  /etc/samba/smb.conf ; do
             if dpkg-divert --list $file | grep -q 'grml-etc$' ; then
                rm_conffile $file
                dpkg-divert --quiet --package grml-etc --remove --rename --divert $file.original $file