X-Git-Url: https://git.grml.org/?p=grml-debootstrap.git;a=blobdiff_plain;f=chroot-script;h=d1bdb958d9c73b2e26999375d2f88c64400aa72a;hp=a711641bf58f81568848aaa4963c2c063fb1331b;hb=147838d5fdc817ed26f1cf3e465dddd966356870;hpb=d27799d91e7f4bda64cd520917d6a2d2b496e0c5

diff --git a/chroot-script b/chroot-script
index a711641..d1bdb95 100755
--- a/chroot-script
+++ b/chroot-script
@@ -51,7 +51,7 @@ chrootmirror() {
 
   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
@@ -80,7 +80,7 @@ EOF
 
      # 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
@@ -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
@@ -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
@@ -408,7 +405,7 @@ custom_scripts() {
 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
 }
@@ -426,10 +423,26 @@ 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 {{{
- for i in chrootmirror grmlrepos kernelimg_conf makedev install_policy_rcd \
-     kernel packages extrapackages reconfigure hosts interfaces   \
-     timezone fstab hostname initrd grub_config passwords custom_scripts   \
+
+ # always execute install_policy_rcd
+ install_policy_rcd
+
+ for i in chrootmirror grmlrepos kernelimg_conf \
+     kernel packages extrapackages remove_apt_cache reconfigure hosts interfaces \
+     timezone fstab hostname initrd grub_config passwords custom_scripts         \
      services ; do
      if stage $i ; then
        $i && stage $i done || exit 1