projects
/
grml-live.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Further /etc/runlevel.conf related fixes.
[grml-live.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
d774289
..
e58bbfa
100755
(executable)
--- a/
etc/grml/fai/grml/grml_cleanup_chroot
+++ b/
etc/grml/fai/grml/grml_cleanup_chroot
@@
-112,13
+112,6
@@
einfo "Removing pid-files"
find /var/run -name \*.pid -exec rm {} \;
eend $?
find /var/run -name \*.pid -exec rm {} \;
eend $?
-einfo "Unmounting proc, /dev/pts, /dev/capi"
- umount /proc 2>/dev/null
- umount /dev/pts 2>/dev/null
- umount /dev/capi 2>/dev/null
- umount -a 2>/dev/null
-eend $?
-
einfo "Removing /var/lib/apt/lists/*-stuff, dpkg-status-old and pkgcache.bin"
rm -f /var/lib/apt/lists/*Packages
rm -f /var/lib/apt/lists/*Release
einfo "Removing /var/lib/apt/lists/*-stuff, dpkg-status-old and pkgcache.bin"
rm -f /var/lib/apt/lists/*Packages
rm -f /var/lib/apt/lists/*Release
@@
-169,10
+162,6
@@
else
ewarn "Warning: /usr/bin/grep-dctrl not available."
fi
ewarn "Warning: /usr/bin/grep-dctrl not available."
fi
-einfo "Copying original runlevel.conf to /etc/runlevel.conf"
-cp /etc/runlevel.conf.livecd /etc/runlevel.conf
-eend $?
-
einfo "Removing x-server-conffiles"
rm -f /etc/X11/xorg.conf /etc/X11/XF86Config-4 \
/etc/X11/XF86Config /etc/XF86Config /etc/XF86Config-4
einfo "Removing x-server-conffiles"
rm -f /etc/X11/xorg.conf /etc/X11/XF86Config-4 \
/etc/X11/XF86Config /etc/XF86Config /etc/XF86Config-4
@@
-336,18
+325,12
@@
fi
if [ -x /usr/bin/updatedb ] ; then
einfo "Updating locate-database"
if [ -x /usr/bin/updatedb ] ; then
einfo "Updating locate-database"
- mount -t proc none /proc
updatedb --prunepaths='/tmp /usr/tmp /var/tmp /grml /root /proc /sys'
updatedb --prunepaths='/tmp /usr/tmp /var/tmp /grml /root /proc /sys'
- umount /proc
eend $?
else
ewarn "updatedb not installed" ; eend 0
fi
eend $?
else
ewarn "updatedb not installed" ; eend 0
fi
-einfo "Unmounting all filesystems"
- umount -a
-eend $?
-
################################################################################
# MISC STUFF
# ~~~~~~~~~~
################################################################################
# MISC STUFF
# ~~~~~~~~~~
@@
-368,10
+351,7
@@
eend $?
# file /usr/sbin/* | grep -v ', stripped' | grep -v 'perl' | grep -v 'Bourne' | grep -v 'python' | grep -v 'symbolic link'
#
# Is software by grml-repos up2date?
# file /usr/sbin/* | grep -v ', stripped' | grep -v 'perl' | grep -v 'Bourne' | grep -v 'python' | grep -v 'symbolic link'
#
# Is software by grml-repos up2date?
-# grep-dctrl --field Maintainer 'Michael Prokop' /var/lib/apt/lists/grml.org_repos_._* | grep Package | awk '{print $2}' | xargs echo
-#
-# runlevel.conf:
-# for file in /etc/init.d/* ; do grep $file -q /etc/runlevel.conf.hdinstall || echo $file not found ; done
+# grep-dctrl --field Maintainer 'Michael Prokop' /var/lib/apt/lists/* | grep Package | awk '{print $2}' | xargs echo
################################################################################
## END OF FILE #################################################################
################################################################################
## END OF FILE #################################################################