X-Git-Url: https://git.grml.org/?p=grml-debootstrap.git;a=blobdiff_plain;f=chroot-script;h=deb7b7a655509516c3195133fcda87b527f48e36;hp=0d7504229ecbb34812a7ef3197fe3e1c1de05aab;hb=90f264b5ef5d4f35c8b2bbf9e2a1ce0b75e830ef;hpb=2fbdec2d64ac9c2b1e3cb9e90241366f8770d3b0

diff --git a/chroot-script b/chroot-script
index 0d75042..deb7b7a 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: Mon Nov 06 11:52:24 CET 2006 [mika]
+# Latest change: Mon Nov 06 15:33:28 CET 2006 [mika]
 ################################################################################
 
 set -e # exit on any error
@@ -69,9 +69,10 @@ fi
 echo "Activating shadow passwords."
 shadowconfig on
 echo "Setting password for user root:"
-# TODO: typing the wrong password will exit chroot script
+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"
@@ -144,8 +145,10 @@ if [ -n "$INITRD" ] ; then
    fi
 fi
 
-if [ -n "$GROOT" ] ; then
-   echo "Installing grub"
+if [ -z "$GROOT" ] ; then
+   echo "Warning: \$GROOT is not defined, can not adjust grub configuration therefor."
+else
+   echo "Adjusting grub configuration for use on ${GROOT}."
 
    # copy stage-files to /boot/grub/
    [ -d /boot/grub/ ] || mkdir /boot/grub
@@ -159,17 +162,10 @@ if [ -n "$GROOT" ] ; then
    # finally install grub
    update-grub -y
    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