projects
/
grml-live-grml.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Add at76-usb-modules-2.6.23-grml64 to GRML_FULL
[grml-live-grml.git]
/
etc
/
grml
/
fai
/
grml
/
grml_cleanup_chroot
diff --git
a/etc/grml/fai/grml/grml_cleanup_chroot
b/etc/grml/fai/grml/grml_cleanup_chroot
index
12bd0ae
..
d59c77b
100755
(executable)
--- a/
etc/grml/fai/grml/grml_cleanup_chroot
+++ b/
etc/grml/fai/grml/grml_cleanup_chroot
@@
-52,9
+52,11
@@
einfo "Setting up /etc/inittab"
cp /etc/inittab.grml /etc/inittab
eend $?
cp /etc/inittab.grml /etc/inittab
eend $?
-einfo "Purging removed packages"
-dpkg --purge $(dpkg --list | awk '/^rc/ { print $2}')
-eend $?
+if [ "$(dpkg --list | awk '/^rc/ { print $2}')" != '' ] ; then
+ einfo "Purging removed packages"
+ dpkg --purge $(dpkg --list | awk '/^rc/ { print $2}')
+ eend $?
+fi
if [ -x /usr/bin/make -a -r /usr/src/Makefile ] ; then
einfo "Cleaning up /usr/src/linux-headers-$KERNEL"
if [ -x /usr/bin/make -a -r /usr/src/Makefile ] ; then
einfo "Cleaning up /usr/src/linux-headers-$KERNEL"
@@
-240,7
+242,6
@@
einfo "Cleaning and removing some misc files and directories"
/var/lib/games /var/cache/man \
/var/lib/nfs /var/lib/xkb \
/var/mail/grml /var/account/pacct
/var/lib/games /var/cache/man \
/var/lib/nfs /var/lib/xkb \
/var/mail/grml /var/account/pacct
- mkdir -p /etc/sysconfig/network-scripts /etc/sysconfig/provider
# Recreate empty utmp and wtmp
:>/var/run/utmp
:>/var/run/wtmp
# Recreate empty utmp and wtmp
:>/var/run/utmp
:>/var/run/wtmp
@@
-301,6
+302,12
@@
else
ewarn "clamav[-freshclam] not installed" ; eend 0
fi
ewarn "clamav[-freshclam] not installed" ; eend 0
fi
+if [ -f /etc/default/snort.dpkg-dist -a -f /etc/default/snort ] ; then
+ einfo "Fixxing /etc/default/snort"
+ mv /etc/default/snort.dpkg-dist /etc/default/snort
+ eend $?
+fi
+
if ! [ -r /etc/ld.so.nohwcap ] ; then
einfo "Creating /etc/ld.so.nohwcap"
touch /etc/ld.so.nohwcap
if ! [ -r /etc/ld.so.nohwcap ] ; then
einfo "Creating /etc/ld.so.nohwcap"
touch /etc/ld.so.nohwcap