projects
/
grml-debootstrap.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Use apt-get clean instead of manually removing files in /var/cache/apt/archives
[grml-debootstrap.git]
/
chroot-script
diff --git
a/chroot-script
b/chroot-script
index
a711641
..
b2158aa
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
@@
-116,15
+116,6
@@
EOF
}
# }}}
}
# }}}
-# create default devices {{{
-makedev() {
- if ! [ -r /dev/hda20 ] ; then
- echo "Creating generic devices in /dev - this might take a while..."
- cd /dev && MAKEDEV generic
- fi
-}
-# }}}
-
# make sure services do not start up {{{
install_policy_rcd() {
if ! [ -r /usr/sbin/policy-rc.d ] ; then
# make sure services do not start up {{{
install_policy_rcd() {
if ! [ -r /usr/sbin/policy-rc.d ] ; then
@@
-138,6
+129,12
@@
EOF
}
# }}}
}
# }}}
+# remove now useless apt cache {{{
+remove_apt_cache() {
+ apt-get clean
+}
+# }}}
+
# 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
@@
-408,7
+405,7
@@
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
}
@@
-426,9
+423,25
@@
finalize() {
}
# }}}
}
# }}}
+# signal handler {{{
+signal_handler() {
+ finalize
+ [ -n "$1" ] && EXIT="$1" || EXIT="1"
+ exit "$EXIT"
+}
+# }}}
+
+# set signal handler {{{
+trap signal_handler HUP INT QUIT TERM
+# }}}
+
# execute the functions {{{
# execute the functions {{{
- for i in chrootmirror grmlrepos kernelimg_conf makedev install_policy_rcd \
- kernel packages extrapackages reconfigure hosts interfaces \
+
+ # always execute install_policy_rcd
+ install_policy_rcd
+
+ for i in chrootmirror grmlrepos kernelimg_conf \
+ remove_apt_cache kernel packages extrapackages reconfigure hosts interfaces \
timezone fstab hostname initrd grub_config passwords custom_scripts \
services ; do
if stage $i ; then
timezone fstab hostname initrd grub_config passwords custom_scripts \
services ; do
if stage $i ; then