X-Git-Url: https://git.grml.org/?p=grml-debootstrap.git;a=blobdiff_plain;f=chroot-script;h=c4d809a7a7d40492347bb33ee96bb1cfb0b2e43b;hp=7192cdc81ce12a63dbc22325be7127ab09be7ace;hb=82fac06534e193ebaa985761718dcbd6019c4d46;hpb=775fbc83a9e586051234a8698bdd15e984d2c351

diff --git a/chroot-script b/chroot-script
index 7192cdc..c4d809a 100644
--- a/chroot-script
+++ b/chroot-script
@@ -4,7 +4,7 @@
 # Authors:       grml-team (grml.org), (c) Michael Prokop <mika@grml.org>
 # Bug-Reports:   see http://grml.org/bugs/
 # License:       This file is licensed under the GPL v2.
-# Latest change: Fre Nov 03 23:42:36 CET 2006 [mika]
+# Latest change: Mon Nov 06 12:31:50 CET 2006 [mika]
 ################################################################################
 
 set -e # exit on any error
@@ -69,8 +69,10 @@ fi
 echo "Activating shadow passwords."
 shadowconfig on
 echo "Setting password for user root:"
+set +e # do not exit if passwd returns error due to missmatching passwords
 passwd
 echo ""
+set -e # restore default behaviour again
 
 if ! [ -f /etc/hosts ] ; then
    echo "Setting up /etc/hosts"
@@ -132,14 +134,14 @@ KERNELVER=${KERNELIMG#/boot/vmlinuz-}
 # generate initrd
 if [ -n "$INITRD" ] ; then
    if [ "$RELEASE" = 'sarge' ] ; then
-      einfo "Release sarge detected, will not create an initrd."
-      return 0
-   fi
-   echo "Generating initrd."
-   update-initramfs -c -t -k $KERNELVER
-   if [ -f "/boot/initrd.img-$KERNELVER" ] ; then
-      GRUBINITRD="initrd          /boot/initrd.img-$KERNELVER"
-      LILOINITRD="        initrd=/boot/initrd.img-$KERNELVER"
+      echo "Release sarge detected, will not create an initrd."
+   else
+      echo "Generating initrd."
+      update-initramfs -c -t -k $KERNELVER
+      if [ -f "/boot/initrd.img-$KERNELVER" ] ; then
+         GRUBINITRD="initrd          /boot/initrd.img-$KERNELVER"
+         LILOINITRD="        initrd=/boot/initrd.img-$KERNELVER"
+      fi
    fi
 fi
 
@@ -148,26 +150,26 @@ if [ -n "$GROOT" ] ; then
 
    # copy stage-files to /boot/grub/
    [ -d /boot/grub/ ] || mkdir /boot/grub
-   cp /usr/lib/grub/i386-pc/* /boot/grub/
+   if [ -d /usr/lib/grub/i386-pc/ ] ; then
+      cp /usr/lib/grub/i386-pc/* /boot/grub/
+   else
+      # sarge ships grub files in another directory
+      cp /lib/grub/i386-pc/* /boot/grub/
+   fi
 
    # finally install grub
    update-grub -y
-   sed -i "s/groot=.*/groot=(${GROOT})/g" /boot/grub/menu.lst
+   sed -i "s/^# groot=.*/# groot=(${GROOT})/g" /boot/grub/menu.lst
+   sed -i "s|^# kopt=root=.*|# kopt=root=${TARGET} ro|g" /boot/grub/menu.lst
    # not sure why savedefault does not work for me; any ideas?
    sed -i "s/^savedefault.*/# &/g" /boot/grub/menu.lst
    update-grub -y
-
-   if [ -z "$MBR" ] ; then
-      echo "Notice: \$MBR not set, will not install grub therefor."
-   else
-      cp /proc/mounts /etc/mtab
-      grub-install "$MBR"
-      rm /etc/mtab
-   fi
 fi
 
 # make sure we don't have any running processes left
-[ -x /etc/init.d/ssh ] && /etc/init.d/ssh stop
+for service in ssh mdadm mdadm-raid ; do
+    [ -x "/etc/init.d/$service" ] && "/etc/init.d/$service" stop
+done
 
 # unmount all filesystems in chroot, make sure nothing is left...
 umount -a    1>/dev/null 2>/dev/null || true