Updated TODO

[grml-debootstrap.git] / chroot-script

diff --git a/chroot-script b/chroot-script
index 37415f3..0fcaa58 100644 (file)
--- 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 14:47:54 CET 2006 [mika]
+# Latest change: Fre Nov 03 17:15:42 CET 2006 [mika]
 ################################################################################
 
 set -e # exit on any error
@@ -17,6 +17,10 @@ if [ -n "$CHROOTMIRROR" ] ; then
    echo "$CHROOTMIRROR" > /etc/apt/sources.list
 fi
 
+# if ! [ -n /etc/kernel-img.conf ] ; then
+#   echo "do_initrd = Yes" > /etc/kernel-img.conf
+# fi
+
 # install additional packages
 if [ "$PACKAGES" = 'yes' ] ; then
    if ! [ -r /etc/debootstrap/packages ] ; then
@@ -96,48 +100,25 @@ fi
 
 if [ -n "$GROOT" ] ; then
    echo "Installing grub"
-#   if ! [ -f /boot/grub/menu.lst ] ; then
-#      # setup grub
-#      mkdir /boot/grub
-#      cat >> /boot/grub/menu.lst << EOF
-## Boot automatically after 30 secs.
-#timeout 30
-#
-## By default, boot the first entry.
-#default 0
-#
-## Fallback to the second entry.
-#fallback 1
-#
-#title           Debian Etch, kernel $KERNELVER (on $ARGET)
-#root            (hd0,0)
-#kernel          $KERNELIMG root=$TARGET ro
-#$GRUBINITRD
-#
-## For booting Windows
-## title Windows
-## rootnoverify (hd0,0)
-## makeactive
-## chainloader  +1
-#EOF
-#   fi
 
    # copy stage-files to /boot/grub/
    [ -d /boot/grub/ ] || mkdir /boot/grub
    cp /usr/lib/grub/i386-pc/* /boot/grub/
 
-   # otherwise grub fails with 'Could not find device for /boot/boot: not found or not a block device'
-   # cp /etc/mtab /etc/mtab.old
-   # cp /proc/mounts /etc/mtab
-
    # finally install grub
-   # grub-install $BOOT
    update-grub -y
-   sed -i "s/groot=.*/groot=(${GROOT})" /boot/grub/menu.lst
+   sed -i "s/groot=.*/groot=(${GROOT})/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
 
-   # restore mtab again
-   # mv /etc/mtab.old /etc/mtab
+   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
 
 # unmount all filesystems in chroot, make sure nothing is left...