Export LANG=C and LC_ALL=C

[grml-debootstrap.git] / chroot-script

diff --git a/chroot-script b/chroot-script
index 0d75042..662365d 100644 (file)
--- 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: Mon Nov 06 11:52:24 CET 2006 [mika]
+# Latest change: Sam Nov 18 10:32:33 CET 2006 [mika]
 ################################################################################
 
 set -e # exit on any error
@@ -17,6 +17,10 @@ if [ -n "$CHROOTMIRROR" ] ; then
    echo "deb $CHROOTMIRROR $RELEASE main contrib non-free" > /etc/apt/sources.list
 fi
 
+if [ -n "$GRMLREPOS" ] ; then
+   echo 'deb     http://grml.org/repos/ ./' >> /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
@@ -40,7 +44,7 @@ if [ "$PACKAGES" = 'yes' ] ; then
      exit 1
    else
      apt-get update
-     apt-get --force-yes -y install $(cat /etc/debootstrap/packages)
+     apt-get --force-yes -y install $(cat /etc/debootstrap/packages) $GRMLPACKAGES
    fi
 fi
 
@@ -69,9 +73,10 @@ fi
 echo "Activating shadow passwords."
 shadowconfig on
 echo "Setting password for user root:"
-# TODO: typing the wrong password will exit chroot script
+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"
@@ -144,8 +149,10 @@ if [ -n "$INITRD" ] ; then
    fi
 fi
 
-if [ -n "$GROOT" ] ; then
-   echo "Installing grub"
+if [ -z "$GROOT" ] ; then
+   echo "Warning: \$GROOT is not defined, can not adjust grub configuration therefor."
+else
+   echo "Adjusting grub configuration for use on ${GROOT}."
 
    # copy stage-files to /boot/grub/
    [ -d /boot/grub/ ] || mkdir /boot/grub
@@ -159,17 +166,10 @@ if [ -n "$GROOT" ] ; then
    # finally install grub
    update-grub -y
    sed -i "s/^# groot=.*/# groot=(${GROOT})/g" /boot/grub/menu.lst
+   sed -i "s|^# kopt=root=.*|# kopt=root=${TARGET} ro|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
 
 # make sure we don't have any running processes left