projects
/
grml-live-grml.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Update changelog, log the executed FAI command line to /var/log/grml-live.log
[grml-live-grml.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
9af8da1
..
e8c634c
100755
(executable)
--- a/
etc/grml/fai/config/scripts/GRMLBASE/98-clean-chroot
+++ b/
etc/grml/fai/config/scripts/GRMLBASE/98-clean-chroot
@@
-1,10
+1,10
@@
#!/bin/sh
#!/bin/sh
-# Filename: /etc/grml/fai/config/scripts/GRML/98-clean-chroot
+# Filename: /etc/grml/fai/config/scripts/GRML
BASE
/98-clean-chroot
# Purpose: clean up chroot system
# 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.
# Purpose: clean up chroot system
# 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:
Wed Sep 19 13:51:05 CES
T 2007 [mika]
+# Latest change:
Mon Nov 05 22:37:04 CE
T 2007 [mika]
################################################################################
set -e
################################################################################
set -e
@@
-12,28
+12,30
@@
set -e
# remove some big directories when using class LATEX_CLEANUP:
if ifclass LATEX_CLEANUP ; then
cp /etc/grml/fai/grml/grml_cleanup_chroot.latex_cleanup $target/root/
# remove some big directories when using class LATEX_CLEANUP:
if ifclass LATEX_CLEANUP ; then
cp /etc/grml/fai/grml/grml_cleanup_chroot.latex_cleanup $target/root/
- $ROOTCMD /root/grml_cleanup_chroot.latex_cleanup
+ $ROOTCMD
/root/grml_cleanup_chroot.latex_cleanup
rm $target/root/grml_cleanup_chroot.latex_cleanup
fi
# skip tasks which require only when using class NO_ONLINE:
if ! ifclass NO_ONLINE ; then
rm $target/root/grml_cleanup_chroot.latex_cleanup
fi
# skip tasks which require only when using class NO_ONLINE:
if ! ifclass NO_ONLINE ; then
- cp /etc/grml/fai/grml/grml_cleanup_chroot.
no_
online $target/root/
- $ROOTCMD
/root/grml_cleanup_chroot.no_
online
- rm $target/root/grml_cleanup_chroot.
no_
online
+ cp /etc/grml/fai/grml/grml_cleanup_chroot.online $target/root/
+ $ROOTCMD
/root/grml_cleanup_chroot.
online
+ rm $target/root/grml_cleanup_chroot.online
fi
# remove /usr/share/doc, /usr/share/info,... only in class REMOVE_DOCS:
if ifclass REMOVE_DOCS ; then
cp /etc/grml/fai/grml/grml_cleanup_chroot.remove_docs $target/root/
fi
# remove /usr/share/doc, /usr/share/info,... only in class REMOVE_DOCS:
if ifclass REMOVE_DOCS ; then
cp /etc/grml/fai/grml/grml_cleanup_chroot.remove_docs $target/root/
- $ROOTCMD /root/grml_cleanup_chroot.remove_docs
+ $ROOTCMD
/root/grml_cleanup_chroot.remove_docs
rm $target/root/grml_cleanup_chroot.remove_docs
fi
# misc cleanup:
rm $target/root/grml_cleanup_chroot.remove_docs
fi
# misc cleanup:
-cp /etc/grml/fai/grml/grml_cleanup_chroot $target/root/
-$ROOTCMD /root/grml_cleanup_chroot
-rm $target/root/grml_cleanup_chroot
+if [ -f /etc/grml/fai/grml/grml_cleanup_chroot ] ; then
+ cp /etc/grml/fai/grml/grml_cleanup_chroot $target/root/
+ $ROOTCMD /root/grml_cleanup_chroot
+ rm $target/root/grml_cleanup_chroot
+fi
# make sure GRML_SMALL uses the appropriate configuration:
if ifclass GRML_SMALL ; then
# make sure GRML_SMALL uses the appropriate configuration:
if ifclass GRML_SMALL ; then
@@
-41,5
+43,12
@@
if ifclass GRML_SMALL ; then
cp $target/etc/runlevel.conf.livecd.small $target/etc/runlevel.conf
fi
cp $target/etc/runlevel.conf.livecd.small $target/etc/runlevel.conf
fi
+if ifclass RELEASE ; then
+ # Remove all FAI logs from chroot via grml-live later then:
+ touch $target/etc/grml_fai_release
+ # Remove all files inside /root/ of chroot:
+ rm -rf $target/root/.* $target/root/*
+fi
+
## END OF FILE #################################################################
# vim:ft=sh expandtab ai tw=80 tabstop=4 shiftwidth=3
## END OF FILE #################################################################
# vim:ft=sh expandtab ai tw=80 tabstop=4 shiftwidth=3