X-Git-Url: https://git.grml.org/?p=grml-debootstrap.git;a=blobdiff_plain;f=chroot-script;h=9ca8d1297a43a0db5028c42603807c3c52672802;hp=0f11ff9c4809bec5fb7e980822121f0503aef17e;hb=3067ce85df1efd3fec199d5ebb079ff5ec2d93ee;hpb=cbf40a49324ae7feb468e528a7845465304faaff

diff --git a/chroot-script b/chroot-script
index 0f11ff9..9ca8d12 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
@@ -172,14 +163,6 @@ extrapackages() {
 }
 # }}}
 
-#  sarge specific stuff: mkinitrd {{{
-mkinitrd() {
-  if [ "$RELEASE" = 'sarge' ] ; then
-     sed -i "s#ROOT=probe#ROOT=$TARGET#" /etc/mkinitrd/mkinitrd.conf
-  fi
-}
-# }}}
-
 # install kernel packages {{{
 kernel() {
   # do not override $KERNEL if set via config file
@@ -193,13 +176,9 @@ kernel() {
 
   if [ -n "$KERNEL" ] ; then
      $APTUPDATE
-     if [ "$RELEASE" = 'sarge' ] ; then
-        KERNELPACKAGES="kernel-image-$KERNEL kernel-headers-$KERNEL"
-     else
-        # note: install busybox to be able to debug initramfs
-        KERNELPACKAGES="linux-image-$KERNEL linux-headers-$KERNEL busybox"
-     fi
-      DEBIAN_FRONTEND=$DEBIAN_FRONTEND $APTINSTALL $KERNELPACKAGES
+     # note: install busybox to be able to debug initramfs
+     KERNELPACKAGES="linux-image-$KERNEL linux-headers-$KERNEL busybox"
+     DEBIAN_FRONTEND=$DEBIAN_FRONTEND $APTINSTALL $KERNELPACKAGES
   fi
 }
 # }}}
@@ -420,7 +399,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
 }
@@ -438,9 +417,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 {{{
- for i in chrootmirror grmlrepos kernelimg_conf makedev install_policy_rcd \
-     kernel packages extrapackages mkinitrd reconfigure hosts interfaces   \
+
+ # always execute install_policy_rcd
+ 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
      if stage $i ; then