projects
/
grml-live.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Remove /etc/resolvconf/resolv.conf.d/original during cleanup
[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
19464a2
..
b7f93e0
100755
(executable)
--- a/
etc/grml/fai/config/scripts/GRMLBASE/98-clean-chroot
+++ b/
etc/grml/fai/config/scripts/GRMLBASE/98-clean-chroot
@@
-49,15
+49,6
@@
if grep -q 'updatebase.GRMLBASE' ${target}/etc/udev/kernel-upgrade 2>/dev/null ;
$ROOTCMD rm -f /etc/udev/kernel-upgrade
fi
$ROOTCMD rm -f /etc/udev/kernel-upgrade
fi
-set +u
-if ifclass RELEASE ; then
-set -u
- echo "Not updating package list as RELEASE class is set."
-else
- echo "Updating package list"
- $ROOTCMD apt-get update
-fi
-
echo "Cleaning apt places"
$ROOTCMD apt-get check 2>/dev/null
$ROOTCMD dpkg --clear-avail
echo "Cleaning apt places"
$ROOTCMD apt-get check 2>/dev/null
$ROOTCMD dpkg --clear-avail
@@
-209,6
+200,7
@@
else
# DO NOT EDIT THIS FILE BY HAND -- YOUR CHANGES WILL BE OVERWRITTEN
EOF
fi
# DO NOT EDIT THIS FILE BY HAND -- YOUR CHANGES WILL BE OVERWRITTEN
EOF
fi
+ rm -f ${target}/etc/resolvconf/resolv.conf.d/original
rm -f ${target}/etc/resolv.conf
$ROOTCMD ln -s /etc/resolvconf/run/resolv.conf /etc/resolv.conf
fi
rm -f ${target}/etc/resolv.conf
$ROOTCMD ln -s /etc/resolvconf/run/resolv.conf /etc/resolv.conf
fi