X-Git-Url: https://git.grml.org/?p=grml-debootstrap.git;a=blobdiff_plain;f=chroot-script;h=fc35e95b5c85ec7485b743553129aac563d4faa1;hp=3eda6af4a4f6d10639d6f578cb25b08723947876;hb=89e2ad98ad3b1362bb43d7b1634780c1c9db372f;hpb=ba5dcb3d878c31ba77a1f93610a8c05aeef59466

diff --git a/chroot-script b/chroot-script
index 3eda6af..fc35e95 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 14:02:25 CET 2006 [mika]
+# Latest change: Fre Nov 03 15:24:53 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
@@ -65,11 +69,11 @@ fi
 # set up /etc/fstab if file is UNCONFIGURED
 if grep -q UNCONFIGURED /etc/fstab ; then
    echo "Setting up /etc/fstab"
-cat >> /etc/fstab << EOF
+cat > /etc/fstab << EOF
+$TARGET      /            auto    defaults,errors=remount-ro 0   1
 sysfs          /sys         sysfs   auto                       0   0
 proc           /proc        proc    defaults                   0   0
-$TARGET      /            auto    defaults,errors=remount-ro 0   1
-# /dev/sda2      none         swap    sw                         0   0
+# /dev/sda2    none         swap    sw                         0   0
 /dev/cdrom     /mnt/cdrom0  iso9660 ro,user,noauto             0   0
 EOF
 fi
@@ -94,85 +98,27 @@ if [ -n "$INITRD" ] ; then
    fi
 fi
 
-if [ "$BOOTMGR" = 'grub' ] ; then
+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 -i /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
+   cp /usr/lib/grub/i386-pc/* /boot/grub/
 
    # finally install grub
-   # grub-install $BOOT
+   update-grub -y
+   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
-fi
-
-if [ "$BOOTMGR" = 'lilo' ] ; then
-   echo "Installing lilo"
-# /usr/share/doc/lilo/examples/conf.sample
-cat > /etc/lilo.conf << EOF
-# This allows booting from any partition on disks with more than 1024 cylinders.
-lba32
-
-# Specifies the boot device
-boot=$BOOT
-
-# Specifies the device that should be mounted as root.
-root=$TARGET
-
-# use Debian on software raid:
-# raid-extra-boot=mbr-only
-
-install=text
-# prompt
-timeout=1
-map=/boot/map
-vga=normal
-
-image=/boot/vmlinuz-2.6.17-grml
-        label="$KERNELVER"
-        #append="...."
-        read-only
-        $LILOINITRD
-EOF
 fi
 
 # unmount all filesystems in chroot, make sure nothing is left...
-umount -a     || true
-umount /proc  || true
-umount /proc  || true
-umount -a     || true
+umount -a    1>/dev/null 2>/dev/null || true
+umount /proc 1>/dev/null 2>/dev/null || true
+umount /proc 1>/dev/null 2>/dev/null || true
+umount -a    1>/dev/null 2>/dev/null || true
 
 # finally exit the chroot
 echo "Finished chroot installation, exiting."