X-Git-Url: https://git.grml.org/?p=grml-debootstrap.git;a=blobdiff_plain;f=chroot-script;h=50d3f4f6d862a1a4e51088be768c3fb45e635611;hp=aa468748dbac9739b5ed916478b6860e29117c2e;hb=68dbb4420447df9e744a195718e3dc6068c9ddee;hpb=2d25ecbf349a8bf1f8d13700807c2a45c13216f3

diff --git a/chroot-script b/chroot-script
index aa46874..50d3f4f 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 17:15:42 CET 2006 [mika]
+# Latest change: Fre Nov 03 23:19:29 CET 2006 [mika]
 ################################################################################
 
 set -e # exit on any error
@@ -14,12 +14,18 @@ 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 ! [ -n /etc/kernel-img.conf ] ; then
-#   echo "do_initrd = Yes" > /etc/kernel-img.conf
-# 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
@@ -28,10 +34,20 @@ 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
 
+if [ -n "$KERNEL" ] ; then
+   apt-get update
+   if [ "$RELEASE" = 'sarge' ] ; then
+      KERNELPACKAGES="kernel-image-$KERNEL"
+   else
+      KERNELPACKAGES="linux-image-$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."
@@ -66,16 +82,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
 $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/sda2    none         swap    sw                         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
@@ -113,7 +149,7 @@ if [ -n "$GROOT" ] ; then
    update-grub -y
 
    if [ -z "$MBR" ] ; then
-      echo "Notice: \$MBR not set, not install grub therefore."
+      echo "Notice: \$MBR not set, will not install grub therefor."
    else
       cp /proc/mounts /etc/mtab
       grub-install "$MBR"
@@ -121,6 +157,9 @@ if [ -n "$GROOT" ] ; then
    fi
 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    1>/dev/null 2>/dev/null || true
 umount /proc 1>/dev/null 2>/dev/null || true