set +e in passwd code

[grml-debootstrap.git] / chroot-script

diff --git a/chroot-script b/chroot-script
index cb90ebe..7fa771b 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.
 # 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 22:27:09 CET 2006 [mika]
+# Latest change: Mon Nov 06 11:52:24 CET 2006 [mika]

 ################################################################################
 
 set -e # exit on any error
 ################################################################################
 
 set -e # exit on any error


@@ -14,7 +14,7 @@ set -e # exit on any error
 [ -r /proc/1 ] || mount -t proc   none /proc
 
 if [ -n "$CHROOTMIRROR" ] ; then
 [ -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
 fi
 
 if ! [ -r /etc/kernel-img.conf ] ; then


@@ -27,6 +27,12 @@ do_symlinks = Yes
 EOF
 fi
 
 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
 if [ "$PACKAGES" = 'yes' ] ; then
    if ! [ -r /etc/debootstrap/packages ] ; then
 # install additional packages
 if [ "$PACKAGES" = 'yes' ] ; then
    if ! [ -r /etc/debootstrap/packages ] ; then


@@ -34,10 +40,25 @@ if [ "$PACKAGES" = 'yes' ] ; then
      exit 1
    else
      apt-get update
      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)

    fi
 fi
 
    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."
 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."


@@ -48,8 +69,10 @@ fi
 echo "Activating shadow passwords."
 shadowconfig on
 echo "Setting password for user root:"
 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 ""
 passwd
 echo ""

+set -e # restore default behaviour again

 
 if ! [ -f /etc/hosts ] ; then
    echo "Setting up /etc/hosts"
 
 if ! [ -f /etc/hosts ] ; then
    echo "Setting up /etc/hosts"


@@ -104,23 +127,21 @@ if [ -n "$HOSTNAME" ] ; then
    echo "$HOSTNAME" > /etc/hostname
 fi
 
    echo "$HOSTNAME" > /etc/hostname
 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
-

 # assume the first available kernel as our main kernel
 KERNELIMG=$(ls -1 /boot/vmlinuz-* | head -1)
 KERNELVER=${KERNELIMG#/boot/vmlinuz-}
 
 # generate initrd
 if [ -n "$INITRD" ] ; then
 # assume the first available kernel as our main kernel
 KERNELIMG=$(ls -1 /boot/vmlinuz-* | head -1)
 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
 
    fi
 fi
 


@@ -129,11 +150,16 @@ if [ -n "$GROOT" ] ; then
 
    # copy stage-files to /boot/grub/
    [ -d /boot/grub/ ] || mkdir /boot/grub
 
    # copy stage-files to /boot/grub/
    [ -d /boot/grub/ ] || mkdir /boot/grub

-   cp /usr/lib/grub/i386-pc/* /boot/grub/
+   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
    update-grub -y
 
    # finally install grub
    update-grub -y

-   sed -i "s/groot=.*/groot=(${GROOT})/g" /boot/grub/menu.lst
+   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
    # not sure why savedefault does not work for me; any ideas?
    sed -i "s/^savedefault.*/# &/g" /boot/grub/menu.lst
    update-grub -y


@@ -148,7 +174,9 @@ if [ -n "$GROOT" ] ; then
 fi
 
 # make sure we don't have any running processes left
 fi
 
 # make sure we don't have any running processes left

-[ -x /etc/init.d/ssh ] && /etc/init.d/ssh stop
+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    1>/dev/null 2>/dev/null || true
 
 # unmount all filesystems in chroot, make sure nothing is left...
 umount -a    1>/dev/null 2>/dev/null || true