projects
/
grml-etc.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
f4935d0
)
another try to fix the smb.conf-diversion
0.8-32
author
Michael Prokop
<mika@grml.org>
Thu, 2 Nov 2006 20:13:45 +0000
(21:13 +0100)
committer
Michael Prokop
<mika@grml.org>
Thu, 2 Nov 2006 20:13:45 +0000
(21:13 +0100)
debian/preinst
patch
|
blob
|
history
diff --git
a/debian/preinst
b/debian/preinst
index
aaebc30
..
615ed55
100755
(executable)
--- a/
debian/preinst
+++ b/
debian/preinst
@@
-64,9
+64,9
@@
case "$1" in
fi
fi
fi
fi
- # move files from package grml-etc to grml-etc-core
/ remove them at all
+ # move files from package grml-etc to grml-etc-core
for file in /etc/zsh/zlogin /etc/zsh/zprofile /etc/zsh/zshenv /etc/zsh/zshrc \
for file in /etc/zsh/zlogin /etc/zsh/zprofile /etc/zsh/zshenv /etc/zsh/zshrc \
- /etc/zsh/zshrc /etc/zsh/zlogout /etc/vim/vimrc
/etc/samba/smb.conf
; do
+ /etc/zsh/zshrc /etc/zsh/zlogout /etc/vim/vimrc ; 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
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
@@
-78,6
+78,11
@@
case "$1" in
dpkg-divert --quiet --package grml-etc --remove --rename --divert /etc/skel/.zshrc.original /etc/skel/.zshrc
fi
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
;;
*)
echo "preinst called with unknown argument $1" >&2