projects
/
grml-live.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Improve the way deborphan works in /etc/grml/fai/grml/grml_cleanup_chroot.deborphan...
[grml-live.git]
/
etc
/
grml
/
fai
/
config
/
scripts
/
GRMLBASE
/
98-clean-chroot
diff --git
a/etc/grml/fai/config/scripts/GRMLBASE/98-clean-chroot
b/etc/grml/fai/config/scripts/GRMLBASE/98-clean-chroot
index
b95c792
..
b5f193e
100755
(executable)
--- a/
etc/grml/fai/config/scripts/GRMLBASE/98-clean-chroot
+++ b/
etc/grml/fai/config/scripts/GRMLBASE/98-clean-chroot
@@
-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 or any later version.
# 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 or any later version.
-# Latest change:
Die Jän 08 09:11:17 CE
T 2008 [mika]
+# Latest change:
Sat Sep 06 20:05:02 CES
T 2008 [mika]
################################################################################
set -e
################################################################################
set -e
@@
-23,6
+23,14
@@
if ! ifclass NO_ONLINE ; then
rm $target/root/grml_cleanup_chroot.online
fi
rm $target/root/grml_cleanup_chroot.online
fi
+# make sure to drop from grml-small what's unnecessary:
+if ifclass GRML_SMALL ; then
+ $ROOTCMD apt-get -y --purge remove aptitude
+ for pkg in groff-base info locales man-db manpages nano; do
+ $ROOTCMD dpkg --purge $pkg || true
+ done
+fi
+
# drop unnecessary software:
if ifclass GRML_SMALL || ifclass DEBORPHAN ; then
if [ -f /etc/grml/fai/grml/grml_cleanup_chroot.deborphan ] ; then
# drop unnecessary software:
if ifclass GRML_SMALL || ifclass DEBORPHAN ; then
if [ -f /etc/grml/fai/grml/grml_cleanup_chroot.deborphan ] ; then
@@
-32,13
+40,6
@@
if ifclass GRML_SMALL || ifclass DEBORPHAN ; then
fi
fi
fi
fi
-# make sure to drop from grml-small what's unnecessary:
-if ifclass GRML_SMALL ; then
- for pkg in groff-base info locales man-db manpages nano; do
- $ROOTCMD dpkg --purge $pkg || true
- done
-fi
-
# remove /usr/share/doc, /usr/share/info,... only in class REMOVE_DOCS:
# (important: remove them *after* deinstalling packages, otherwise
# removing packages might fail due to lack of /usr/share/man/...)
# remove /usr/share/doc, /usr/share/info,... only in class REMOVE_DOCS:
# (important: remove them *after* deinstalling packages, otherwise
# removing packages might fail due to lack of /usr/share/man/...)