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

diff --git a/chroot-script b/chroot-script
index 3eda6af..7fa771b 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: Mon Nov 06 11:52:24 CET 2006 [mika]
 ################################################################################
 
 set -e # exit on any error
@@ -14,7 +14,23 @@ 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
+   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
+
+# 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
@@ -24,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."
@@ -38,8 +69,10 @@ fi
 echo "Activating shadow passwords."
 shadowconfig on
 echo "Setting password for user root:"
+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"
@@ -62,22 +95,36 @@ if [ -n "$TIMEZONE" ] ; then
    ln -sf /usr/share/zoneinfo/$TIMEZONE /etc/localtime
 fi
 
-# set up /etc/fstab if file is UNCONFIGURED
-if grep -q UNCONFIGURED /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
 
-# create default devices
-if ! [ -r /dev/hda20 ] ; then
-   echo "Creating generic devices in /dev - this might take a while..."
-   cd /dev && MAKEDEV generic
+# 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
 
 # assume the first available kernel as our main kernel
@@ -86,93 +133,56 @@ KERNELVER=${KERNELIMG#/boot/vmlinuz-}
 
 # generate initrd
 if [ -n "$INITRD" ] ; then
-   echo "Generating initrd."
-   update-initramfs -c -t -k $KERNELVER
-   if [ -f "/boot/initrd.img-$KERNELVER" ] ; then
-      GRUBINITRD="initrd          /boot/initrd.img-$KERNELVER"
-      LILOINITRD="        initrd=/boot/initrd.img-$KERNELVER"
+   if [ "$RELEASE" = 'sarge' ] ; then
+      echo "Release sarge detected, will not create an initrd."
+   else
+      echo "Generating initrd."
+      update-initramfs -c -t -k $KERNELVER
+      if [ -f "/boot/initrd.img-$KERNELVER" ] ; then
+         GRUBINITRD="initrd          /boot/initrd.img-$KERNELVER"
+         LILOINITRD="        initrd=/boot/initrd.img-$KERNELVER"
+      fi
    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
+   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
-   # 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
+   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
+for service in ssh mdadm mdadm-raid ; do
+    [ -x "/etc/init.d/$service" ] && "/etc/init.d/$service" stop
+done
 
 # 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."