From 90384ea15c26d7647bdfbe11d4377e46e112307a Mon Sep 17 00:00:00 2001 From: Michael Prokop Date: Mon, 9 Apr 2007 15:34:26 +0200 Subject: [PATCH] Add support for stages to chroot-script --- chroot-script | 67 +++++++++++++++++++++++++++++++++++++++++++++++++++++--- grml-debootstrap | 6 +++-- 2 files changed, 68 insertions(+), 5 deletions(-) diff --git a/chroot-script b/chroot-script index 662365d..1bdfca6 100644 --- a/chroot-script +++ b/chroot-script @@ -4,24 +4,56 @@ # Authors: grml-team (grml.org), (c) Michael Prokop # Bug-Reports: see http://grml.org/bugs/ # License: This file is licensed under the GPL v2. -# Latest change: Sam Nov 18 10:32:33 CET 2006 [mika] +# Latest change: Mon Apr 09 15:33:33 CEST 2007 [mika] ################################################################################ set -e # exit on any error . /etc/debootstrap/config || exit 1 +if [ -z "$STAGES" ] ; then + STAGES='/etc/debootstrap/stages' + [ -d "$STAGES" ] || mkdir -p "$STAGES" +fi + +stage() { + # error handling + if [ -z "$1" ] ; then + eerror 'Error: stage() requires at least one argument.' + eend 1 + return 1 + fi + if [ -z "$STAGES" ] ; then + eerror 'Error: $STAGES not set.' + eend 1 + return 1 + fi + # main function + if [ -f "$STAGES/$1" ] ; then + if grep -q done "$STAGES/$1" ; then + ewarn "Notice: stage $1 has been executed already, skipping execution therefore." ; eend 0 + fi + else + echo "$2" > "$STAGES/$1" + fi +} + [ -r /proc/1 ] || mount -t proc none /proc if [ -n "$CHROOTMIRROR" ] ; then + stage chrootmirror echo "deb $CHROOTMIRROR $RELEASE main contrib non-free" > /etc/apt/sources.list + stage chrootmirror done fi if [ -n "$GRMLREPOS" ] ; then + stage grmlrepos echo 'deb http://grml.org/repos/ ./' >> /etc/apt/sources.list + stage grmlrepos done fi if ! [ -r /etc/kernel-img.conf ] ; then + stage kernelimg.conf echo "Setting up /etc/kernel-img.conf" cat > /etc/kernel-img.conf << EOF # Kernel Image management overrides @@ -29,16 +61,20 @@ if ! [ -r /etc/kernel-img.conf ] ; then do_initrd = Yes do_symlinks = Yes EOF + stage kernelimg.conf done fi # create default devices if ! [ -r /dev/hda20 ] ; then + stage makedev echo "Creating generic devices in /dev - this might take a while..." cd /dev && MAKEDEV generic + stage makedev done fi # install additional packages if [ "$PACKAGES" = 'yes' ] ; then + stage packages if ! [ -r /etc/debootstrap/packages ] ; then echo "Error: /etc/debootstrap/packages not found, exiting." exit 1 @@ -46,14 +82,18 @@ if [ "$PACKAGES" = 'yes' ] ; then apt-get update apt-get --force-yes -y install $(cat /etc/debootstrap/packages) $GRMLPACKAGES fi + stage packages done fi # sarge specific stuff if [ "$RELEASE" = 'sarge' ] ; then + stage mkinitrd sed -i "s#ROOT=probe#ROOT=$TARGET#" /etc/mkinitrd/mkinitrd.conf + stage mkinitrd done fi if [ -n "$KERNEL" ] ; then + stage kernel apt-get update if [ "$RELEASE" = 'sarge' ] ; then KERNELPACKAGES="kernel-image-$KERNEL kernel-headers-$KERNEL" @@ -61,15 +101,19 @@ if [ -n "$KERNEL" ] ; then KERNELPACKAGES="linux-image-$KERNEL linux-headers-$KERNEL" fi apt-get --force-yes -y install $KERNELPACKAGES + stage kernel done fi if [ -n "$RECONFIGURE" ] ; then + stage reconfigure 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." done + stage reconfigure done fi # set password of user root +stage passwords echo "Activating shadow passwords." shadowconfig on echo "Setting password for user root:" @@ -77,13 +121,17 @@ set +e # do not exit if passwd returns error due to missmatching passwords passwd echo "" set -e # restore default behaviour again +stage passwords done if ! [ -f /etc/hosts ] ; then + stage hosts echo "Setting up /etc/hosts" echo "127.0.0.1 localhost $HOSTNAME" > /etc/hosts + stage hosts done fi if ! [ -f /etc/network/interfaces ] ; then + stage interfaces echo "Setting up /etc/network/interfaces" cat >> /etc/network/interfaces << EOF iface lo inet loopback @@ -91,15 +139,18 @@ iface eth0 inet dhcp auto lo auto eth0 EOF + stage interfaces done fi # adjust timezone if [ -n "$TIMEZONE" ] ; then + stage timezone echo "Adjusting /etc/localtime" ln -sf /usr/share/zoneinfo/$TIMEZONE /etc/localtime + stage timezone done fi -function createfstab(){ +createfstab(){ echo "Setting up /etc/fstab" cat > /etc/fstab << EOF $TARGET / auto defaults,errors=remount-ro 0 1 @@ -117,18 +168,24 @@ EOF # set up /etc/fstab if file is not present (cdebootstrap) if [ ! -f /etc/fstab ] ; then + stage fstab createfstab + stage fstab done fi # set up /etc/fstab if file is UNCONFIGURED (debootstrap) if grep -q UNCONFIGURED /etc/fstab ; then + stage fstab createfstab + stage fstab done fi # set up hostname if [ -n "$HOSTNAME" ] ; then + stage hostname echo "Setting hostname to ${HOSTNAME}." echo "$HOSTNAME" > /etc/hostname + stage hostname done fi # assume the first available kernel as our main kernel @@ -137,6 +194,7 @@ KERNELVER=${KERNELIMG#/boot/vmlinuz-} # generate initrd if [ -n "$INITRD" ] ; then + stage initrd if [ "$RELEASE" = 'sarge' ] ; then echo "Release sarge detected, will not create an initrd." else @@ -147,11 +205,13 @@ if [ -n "$INITRD" ] ; then LILOINITRD=" initrd=/boot/initrd.img-$KERNELVER" fi fi + stage initrd done fi if [ -z "$GROOT" ] ; then - echo "Warning: \$GROOT is not defined, can not adjust grub configuration therefor." + echo "Warning: \$GROOT is not defined, will not adjust grub configuration therefore." else + stage grub echo "Adjusting grub configuration for use on ${GROOT}." # copy stage-files to /boot/grub/ @@ -170,6 +230,7 @@ else # not sure why savedefault does not work for me; any ideas? sed -i "s/^savedefault.*/# &/g" /boot/grub/menu.lst update-grub -y + stage grub done fi # make sure we don't have any running processes left diff --git a/grml-debootstrap b/grml-debootstrap index de5a94a..009b7e6 100644 --- a/grml-debootstrap +++ b/grml-debootstrap @@ -4,7 +4,7 @@ # Authors: grml-team (grml.org), (c) Michael Prokop # Bug-Reports: see http://grml.org/bugs/ # License: This file is licensed under the GPL v2. -# Latest change: Mon Apr 09 15:22:07 CEST 2007 [mika] +# Latest change: Mon Apr 09 15:34:02 CEST 2007 [mika] ################################################################################ # http://www.debian.org/releases/stable/i386/index.html.en @@ -237,7 +237,9 @@ if [ "$FSCK" = 'yes' ] ; then stage fscktool done fi -einfo "All stages have been executed, to rerun grml-debootstrap please manually remove ${STAGES}." +# finally remove stages on main system so grml-deboostrap can be reexecuted + rm -rf "$STAGES" + einfo "Finished execution of $0 - enjoy your Debian system." ; eend 0 ## END OF FILE ################################################################# -- 2.1.4