projects
/
grml-debootstrap.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Do not unmount ISO loopback mount point in finalize().
[grml-debootstrap.git]
/
chroot-script
diff --git
a/chroot-script
b/chroot-script
index
d0f71f3
..
bbd834f
100755
(executable)
--- a/
chroot-script
+++ b/
chroot-script
@@
-51,7
+51,7
@@
chrootmirror() {
if [ -n "$ISO" ] ; then
echo "deb $ISO $RELEASE $COMPONENTS" > /etc/apt/sources.list
if [ -n "$ISO" ] ; then
echo "deb $ISO $RELEASE $COMPONENTS" > /etc/apt/sources.list
- [ -n "$MIRROR" ] && echo "deb $MIRROR $RELEASE $COMPONENTS" >> /etc/apt/sources.list ||
/bin/
true
+ [ -n "$MIRROR" ] && echo "deb $MIRROR $RELEASE $COMPONENTS" >> /etc/apt/sources.list || true
else
if [ -n "$MIRROR" ] ; then
echo "deb $MIRROR $RELEASE $COMPONENTS" > /etc/apt/sources.list
else
if [ -n "$MIRROR" ] ; then
echo "deb $MIRROR $RELEASE $COMPONENTS" > /etc/apt/sources.list
@@
-80,7
+80,7
@@
EOF
# make sure we have the keys available for aptitude
gpg --keyserver subkeys.pgp.net --recv-keys F61E2E7CECDEA787
# make sure we have the keys available for aptitude
gpg --keyserver subkeys.pgp.net --recv-keys F61E2E7CECDEA787
- gpg --export F61E2E7CECDEA787 | apt-key add - ||
/bin/
true # not yet sure
+ gpg --export F61E2E7CECDEA787 | apt-key add - || true # not yet sure
# why it's necessary, sometimes we get an error even though it works [mika]
# make sure we install packages from grml's pool only if not available
# why it's necessary, sometimes we get an error even though it works [mika]
# make sure we install packages from grml's pool only if not available
@@
-129,6
+129,17
@@
EOF
}
# }}}
}
# }}}
+# remove now useless apt cache {{{
+remove_apt_cache() {
+ if [ "$RM_APTCACHE" = 'yes' ] ; then
+ echo "Cleaning apt cache."
+ apt-get clean
+ else
+ echo "Not cleaning apt cache as \$RM_APTCACHE is unset."
+ fi
+}
+# }}}
+
# install additional packages {{{
packages() {
# Pre-seed the debconf database with answers. Each question will be marked
# install additional packages {{{
packages() {
# Pre-seed the debconf database with answers. Each question will be marked
@@
-374,8
+385,11
@@
grub_config() {
# finally install grub
if [ -x /usr/sbin/update-grub ] ; then
UPDATEGRUB='/usr/sbin/update-grub'
# finally install grub
if [ -x /usr/sbin/update-grub ] ; then
UPDATEGRUB='/usr/sbin/update-grub'
- el
se
+ el
if [ -x /sbin/update-grub ] ; then
UPDATEGRUB='/sbin/update-grub'
UPDATEGRUB='/sbin/update-grub'
+ else
+ echo "Error: update-grub not available, can not execute it."
+ return 1
fi
# grub2:
fi
# grub2:
@@
-399,21
+413,20
@@
custom_scripts() {
services() {
for service in ssh mdadm mdadm-raid ; do
if [ -x /etc/init.d/"$service" ] ; then
services() {
for service in ssh mdadm mdadm-raid ; do
if [ -x /etc/init.d/"$service" ] ; then
- /etc/init.d/"$service" stop ||
/bin/
true
+ /etc/init.d/"$service" stop || true
fi
done
}
# }}}
fi
done
}
# }}}
-# unmount
all filesystems in chroot,
make sure nothing is left {{{
+# unmount
/proc and
make sure nothing is left {{{
finalize() {
# make sure we don't leave any sensible data
rm -f /etc/debootstrap/variables
finalize() {
# make sure we don't leave any sensible data
rm -f /etc/debootstrap/variables
+
[ -n "$POLICYRCD" ] && rm -f /usr/sbin/policy-rc.d
[ -n "$POLICYRCD" ] && rm -f /usr/sbin/policy-rc.d
- umount -a 1>/dev/null 2>/dev/null || true
- umount /proc 1>/dev/null 2>/dev/null || true
- umount /proc 1>/dev/null 2>/dev/null || true
- umount -a 1>/dev/null 2>/dev/null || true
+
+ umount /proc >/dev/null 2>/dev/null || true
}
# }}}
}
# }}}
@@
-435,9
+448,9
@@
trap signal_handler HUP INT QUIT TERM
install_policy_rcd
for i in chrootmirror grmlrepos kernelimg_conf \
install_policy_rcd
for i in chrootmirror grmlrepos kernelimg_conf \
- kernel packages extrapackages
reconfigure hosts interfaces
\
- timezone fstab hostname initrd grub_config passwords
custom_scripts
\
- services ; do
+ kernel packages extrapackages
reconfigure hosts interfaces
\
+ timezone fstab hostname initrd grub_config passwords
\
+
custom_scripts remove_apt_cache
services ; do
if stage $i ; then
$i && stage $i done || exit 1
fi
if stage $i ; then
$i && stage $i done || exit 1
fi