projects
/
grml-live.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'mika/efi'
[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
a3e5db8
..
189b652
100755
(executable)
--- a/
etc/grml/fai/config/scripts/GRMLBASE/98-clean-chroot
+++ b/
etc/grml/fai/config/scripts/GRMLBASE/98-clean-chroot
@@
-17,6
+17,8
@@
fi
echo "Creating ~/.zshrc"
touch $target/root/.zshrc
echo "Creating ~/.zshrc"
touch $target/root/.zshrc
+$ROOTCMD rm -f /etc/apt/apt.conf.d/90grml-apt-proxy.conf
+
if [ -x $target/usr/sbin/localepurge ] ; then
echo "Running localepurge"
$ROOTCMD localepurge
if [ -x $target/usr/sbin/localepurge ] ; then
echo "Running localepurge"
$ROOTCMD localepurge
@@
-106,7
+108,7
@@
nuke(){
# set all files in the given directories to a length of zero
zero(){
# set all files in the given directories to a length of zero
zero(){
- for i in $(find "$@" -type f -size +0 -not -name \*.ini 2>/dev/null); do
+ for i in $(find "$@" -type f -size +0 -not -name \*.ini
-not -path '*/fai/*' -not -name install_packages.list
2>/dev/null); do
:> "$i"
done
}
:> "$i"
done
}