X-Git-Url: https://git.grml.org/?p=grml-debootstrap.git;a=blobdiff_plain;f=chroot-script;h=1524da4e6a9df56935d21ad2182ea791378777b2;hp=2f8b964de2f3f2d866c99439fee94831c1d81960;hb=be87c6d1ae33ce0792222b0ed438496ae9ae3b53;hpb=8049bba1690cb33dd986f2836f92d578d17e56bd

diff --git a/chroot-script b/chroot-script
index 2f8b964..1524da4 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 21:57:11 CET 2006 [mika]
+# Latest change: Fre Nov 03 22:48:42 CET 2006 [mika]
 ################################################################################
 
 set -e # exit on any error
@@ -17,7 +17,7 @@ if [ -n "$CHROOTMIRROR" ] ; then
    echo "$CHROOTMIRROR" > /etc/apt/sources.list
 fi
 
-if ! [ -n /etc/kernel-img.conf ] ; then
+if ! [ -r /etc/kernel-img.conf ] ; then
    echo "Setting up /etc/kernel-img.conf"
    cat > /etc/kernel-img.conf << EOF
 # Kernel Image management overrides
@@ -34,7 +34,7 @@ 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
 
@@ -76,10 +76,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
 }
 
@@ -142,6 +147,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