use /lib/grub/i386-pc/ for sarge

[grml-debootstrap.git] / chroot-script

diff --git a/chroot-script b/chroot-script
index 63bc8d8..7f2669a 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 22:27:09 CET 2006 [mika]
+# Latest change: Fre Nov 03 23:42:36 CET 2006 [mika]
 ################################################################################
 
 set -e # exit on any error
@@ -14,7 +14,7 @@ set -e # exit on any error
 [ -r /proc/1 ] || mount -t proc   none /proc
 
 if [ -n "$CHROOTMIRROR" ] ; then
-   echo "$CHROOTMIRROR" > /etc/apt/sources.list
+   echo "deb $CHROOTMIRROR $RELEASE main contrib non-free" > /etc/apt/sources.list
 fi
 
 if ! [ -r /etc/kernel-img.conf ] ; then
@@ -27,6 +27,12 @@ do_symlinks = Yes
 EOF
 fi
 
+# create default devices
+if ! [ -r /dev/hda20 ] ; then
+   echo "Creating generic devices in /dev - this might take a while..."
+   cd /dev && MAKEDEV generic
+fi
+
 # install additional packages
 if [ "$PACKAGES" = 'yes' ] ; then
    if ! [ -r /etc/debootstrap/packages ] ; then
@@ -34,10 +40,25 @@ if [ "$PACKAGES" = 'yes' ] ; then
      exit 1
    else
      apt-get update
-     apt-get -y install $(cat /etc/debootstrap/packages)
+     apt-get --force-yes -y install $(cat /etc/debootstrap/packages)
    fi
 fi
 
+# sarge specific stuff
+if [ "$RELEASE" = 'sarge' ] ; then
+   sed -i "s#ROOT=probe#ROOT=$TARGET#" /etc/mkinitrd/mkinitrd.conf
+fi
+
+if [ -n "$KERNEL" ] ; then
+   apt-get update
+   if [ "$RELEASE" = 'sarge' ] ; then
+      KERNELPACKAGES="kernel-image-$KERNEL kernel-headers-$KERNEL"
+   else
+      KERNELPACKAGES="linux-image-$KERNEL linux-headers-$KERNEL"
+   fi
+   apt-get --force-yes -y install $KERNELPACKAGES
+fi
+
 if [ -n "$RECONFIGURE" ] ; then
    for package in $RECONFIGURE ; do
        dpkg --list $package 1>/dev/null 2>/dev/null && dpkg-reconfigure $package || echo "Warning: $package does not exist, can not reconfigure it."
@@ -76,10 +97,15 @@ function createfstab(){
    echo "Setting up /etc/fstab"
 cat > /etc/fstab << EOF
 $TARGET      /            auto    defaults,errors=remount-ro 0   1
-sysfs          /sys         sysfs   auto                       0   0
+/sys           /sys         sysfs   rw,nosuid,nodev,noexec     0   0
 proc           /proc        proc    defaults                   0   0
 /dev/cdrom     /mnt/cdrom0  iso9660 ro,user,noauto             0   0
-# /dev/sda2    none         swap    sw                         0   0
+# some other examples:
+# /dev/sda2       none         swap    sw                   0   0
+# /dev/hda1       /Grml        ext3    dev,suid,user,noauto 0  2
+# //1.2.3.4/pub   /smb/pub     smbfs   defaults,user,noauto,uid=grml,gid=grml 0 0
+# linux:/pub      /beer        nfs     defaults             0  0
+# tmpfs           /tmp         tmpfs   size=300M            0  0
 EOF
 }
 
@@ -99,18 +125,16 @@ if [ -n "$HOSTNAME" ] ; then
    echo "$HOSTNAME" > /etc/hostname
 fi
 
-# create default devices
-if ! [ -r /dev/hda20 ] ; then
-   echo "Creating generic devices in /dev - this might take a while..."
-   cd /dev && MAKEDEV generic
-fi
-
 # assume the first available kernel as our main kernel
 KERNELIMG=$(ls -1 /boot/vmlinuz-* | head -1)
 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
@@ -124,7 +148,12 @@ 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