X-Git-Url: https://git.grml.org/?p=grml-debootstrap.git;a=blobdiff_plain;f=chroot-script;h=0ced334c1e38d25cd435f636956b710037a3bb42;hp=0e8ea4198fe2a905524f710286638b2c41e5d2bc;hb=401cadc18d81e0a7006e7fca519de688983d2b06;hpb=b2febf4be9ecebfea7d91197cd319753638169f9

diff --git a/chroot-script b/chroot-script
index 0e8ea41..0ced334 100644
--- a/chroot-script
+++ b/chroot-script
@@ -4,26 +4,44 @@
 # 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 01:19:41 CET 2006 [mika]
+# Latest change: Fre Nov 03 11:37:19 CET 2006 [mika]
 ################################################################################
 
 set -e
 
 . /etc/debootstrap/config || exit 1
 
-mount -t proc   none /proc
+[ -r /proc/1 ] || mount -t proc   none /proc
+
+if [ -n "MIRROR_LIST" ] ; then
+   echo $MIRROR_LIST > /etc/apt/sources.list
+fi
+
+# install additional packages
+if [ "$PACKAGES" = 'yes' ] ; then
+   if ! [ -r /etc/debootstrap/packages ] ; then
+     echo "Error: /etc/debootstrap/packages not found, exiting."
+     exit 1
+   else
+     apt-get update
+     apt-get install $(cat /etc/debootstrap/packages)
+   fi
+fi
 
 if [ -n "$RECONFIGURE" ] ; then
    for package in $RECONFIGURE ; do
-       dpkg-reconfigure $package
+       dpkg --list $package && dpkg-reconfigure $package || echo "Warning: $package does not exist, can not reconfigure it."
    done
 fi
 
 # set password of user root
+echo "Activating shadow passwords."
+shadowconfig on
+echo "Setting password for user root:"
 passwd
 
 if ! [ -f /etc/hosts ] ; then
-   echo "127.0.0.1       localhost  $HOSTNAME" > $MNTPOINT/etc/hosts
+   echo "127.0.0.1       localhost  $HOSTNAME" > /etc/hosts
 fi
 
 if ! [ -f /etc/network/interfaces ] ; then
@@ -51,10 +69,12 @@ EOF
 fi
 
 # create default devices
+echo "Creating generic devices in /dev - this might take a while..."
 cd /dev && MAKEDEV generic
 
 # generate initrd
 if [ -n "$INITRD" ] ; then
+   echo "Generating initrd."
    update-initramfs -c -t -k $KERNEL
    if [ -f "/boot/initrd.img-$KERNELVER" ] ; then
       GRUBINITRD="initrd          /boot/initrd.img-$KERNELVER"
@@ -67,6 +87,7 @@ KERNELIMG=$(ls -1 /boot/vmlinuz-* | head -1)
 KERNELVER=${KERNELIMG#/boot/vmlinuz-}
 
 if [ "$BOOTMGR" = 'grub' ] ; then
+   echo "Installing grub"
    if ! [ -f /boot/grub/menu.lst ] ; then
       # setup grub
       mkdir /boot/grub
@@ -101,6 +122,7 @@ EOF
 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.
@@ -129,10 +151,14 @@ image=/boot/vmlinuz-2.6.17-grml
 EOF
 fi
 
-# unmount all filesystems in chroot
+# unmount all filesystems in chroot, make sure nothing is left...
+umount -a
+umount /proc
+umount /proc
 umount -a
 
 # finally exit the chroot
+echo "Finished chroot installation, exiting."
 exit 0
 
 ## END OF FILE #################################################################