X-Git-Url: https://git.grml.org/?p=grml-debootstrap.git;a=blobdiff_plain;f=chroot-script;h=9a2f8f56542d8572f421e4eaa9a28ddf9db7b05b;hp=6b5b3031a9df908719c195a58e1cbe2a585577b4;hb=78bb1b7ce80abf38eb8f1d44cfd116680135f1c4;hpb=866bc342b7b76a9761df1aa6bd658fe65e373641

diff --git a/chroot-script b/chroot-script
index 6b5b303..9a2f8f5 100644
--- a/chroot-script
+++ b/chroot-script
@@ -4,10 +4,10 @@
 # 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 12:27:20 CET 2006 [mika]
+# Latest change: Fre Nov 03 22:27:09 CET 2006 [mika]
 ################################################################################
 
-set -e
+set -e # exit on any error
 
 . /etc/debootstrap/config || exit 1
 
@@ -17,6 +17,16 @@ if [ -n "$CHROOTMIRROR" ] ; then
    echo "$CHROOTMIRROR" > /etc/apt/sources.list
 fi
 
+if ! [ -r /etc/kernel-img.conf ] ; then
+   echo "Setting up /etc/kernel-img.conf"
+   cat > /etc/kernel-img.conf << EOF
+# Kernel Image management overrides
+# See kernel-img.conf(5) for details
+do_initrd = Yes
+do_symlinks = Yes
+EOF
+fi
+
 # install additional packages
 if [ "$PACKAGES" = 'yes' ] ; then
    if ! [ -r /etc/debootstrap/packages ] ; then
@@ -24,13 +34,13 @@ if [ "$PACKAGES" = 'yes' ] ; then
      exit 1
    else
      apt-get update
-     apt-get -y install $(cat /etc/debootstrap/packages)
+     apt-get --force-yes -y $(cat /etc/debootstrap/packages)
    fi
 fi
 
 if [ -n "$RECONFIGURE" ] ; then
    for package in $RECONFIGURE ; do
-       dpkg --list $package && dpkg-reconfigure $package || echo "Warning: $package does not exist, can not reconfigure it."
+       dpkg --list $package 1>/dev/null 2>/dev/null && dpkg-reconfigure $package || echo "Warning: $package does not exist, can not reconfigure it."
    done
 fi
 
@@ -62,15 +72,36 @@ if [ -n "$TIMEZONE" ] ; then
    ln -sf /usr/share/zoneinfo/$TIMEZONE /etc/localtime
 fi
 
-if ! [ -f /etc/fstab ] ; then
+function createfstab(){
    echo "Setting up /etc/fstab"
-cat >> /etc/fstab << EOF
-sysfs          /sys         sysfs   auto                       0   0
-proc           /proc        proc    defaults                   0   0
+cat > /etc/fstab << EOF
 $TARGET      /            auto    defaults,errors=remount-ro 0   1
-# /dev/sda2      none         swap    sw                         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
+# 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
+}
+
+# set up /etc/fstab if file is not present (cdebootstrap)
+if [ ! -f /etc/fstab  ] ; then
+   createfstab
+fi
+
+# set up /etc/fstab if file is UNCONFIGURED (debootstrap)
+if grep -q UNCONFIGURED /etc/fstab ; then
+   createfstab
+fi
+
+# set up hostname
+if [ -n "$HOSTNAME" ] ; then
+   echo "Setting hostname to ${HOSTNAME}."
+   echo "$HOSTNAME" > /etc/hostname
 fi
 
 # create default devices
@@ -93,83 +124,37 @@ 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/
-   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
+   [ -d /boot/grub/ ] || mkdir /boot/grub
+   cp /usr/lib/grub/i386-pc/* /boot/grub/
 
    # finally install grub
-   grub-install $BOOT
-
-   # restore mtab again
-   mv /etc/mtab.old /etc/mtab
+   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
+
+   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
 
-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
+# make sure we don't have any running processes left
+[ -x /etc/init.d/ssh ] && /etc/init.d/ssh stop
 
 # unmount all filesystems in chroot, make sure nothing is left...
-umount -a
-umount /proc
-umount /proc
-umount -a
+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."