X-Git-Url: https://git.grml.org/?p=grml-debootstrap.git;a=blobdiff_plain;f=chroot-script;h=8fdf89438ba4deedf3e2fa99d4e592d26d113de3;hp=a75f34b99989964a14beac1d4734a30d26111fca;hb=f7894c712f146f42cedcd4352f1f3b2f90ce64c2;hpb=b3015dae12151f5eb85e60002a5c20d1678a1059 diff --git a/chroot-script b/chroot-script old mode 100644 new mode 100755 index a75f34b..8fdf894 --- a/chroot-script +++ b/chroot-script @@ -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 16 18:39:21 CEST 2007 [mika] +# Latest change: Tue Aug 26 20:59:31 CEST 2008 [mika] ################################################################################ set -e # exit on any error @@ -12,7 +12,7 @@ set -e # exit on any error . /etc/debootstrap/config || exit 1 . /etc/debootstrap/variables || exit 1 -[ -r /proc/1 ] || mount -t proc none /proc +[ -r /proc/1 ] || mount -t proc none /proc # variable checks {{{ @@ -37,7 +37,7 @@ stage() { echo "$2" > "$STAGES/$1" return 0 elif grep -q done "$STAGES/$1" 2>/dev/null ; then - echo "Notice: stage $1 has been executed already, skipping execution therefore.">&2 + echo "[*] Notice: stage $1 has been executed already, skipping execution therefore.">&2 return 1 fi } @@ -45,8 +45,13 @@ stage() { # define chroot mirror {{{ chrootmirror() { - if [ -n "$CHROOTMIRROR" ] ; then - echo "deb $CHROOTMIRROR $RELEASE main contrib non-free" > /etc/apt/sources.list + if [ -n "$ISO" ] ; then + echo "deb $ISO $RELEASE main contrib" > /etc/apt/sources.list + [ -n "$CHROOTMIRROR" ] && echo "deb $CHROOTMIRROR $RELEASE main contrib non-free" >> /etc/apt/sources.list + else + if [ -n "$CHROOTMIRROR" ] ; then + echo "deb $CHROOTMIRROR $RELEASE main contrib non-free" > /etc/apt/sources.list + fi fi } # }}} @@ -54,7 +59,37 @@ chrootmirror() { # set up grml repository {{{ grmlrepos() { if [ -n "$GRMLREPOS" ] ; then - echo 'deb http://grml.org/repos/ ./' >> /etc/apt/sources.list + cat >> /etc/apt/sources.list << EOF + +# grml: stable repository: + deb http://deb.grml.org/ grml-stable main + deb-src http://deb.grml.org/ grml-stable main + +# grml: testing/development repository: + deb http://deb.grml.org/ grml-testing main + deb-src http://deb.grml.org/ grml-testing main + +EOF + # make sure we have the keys available for aptitude + gpg --keyserver subkeys.pgp.net --recv-keys F61E2E7CECDEA787 + gpg --export F61E2E7CECDEA787 | apt-key add - || /bin/true # not yet sure + # why it's necessary, sometimes we get an error even though it works [mika] + + # make sure we install packages from grml's pool only if not available + # from Debian! + if ! grep -q grml /etc/apt/preferences 2>/dev/null ; then + cat >> /etc/apt/preferences << EOF +// debian pool (default): +Package: * +Pin: release o=Debian +Pin-Priority: 996 + +// main grml-repository: +Package: * +Pin: origin deb.grml.org +Pin-Priority: 991 +EOF + fi fi } # }}} @@ -82,6 +117,19 @@ makedev() { } # }}} +# make sure services do not start up {{{ +install_policy_rcd() { + if ! [ -r /usr/sbin/policy-rc.d ] ; then + export POLICYRCD=1 + cat > /usr/sbin/policy-rc.d << EOF +#!/bin/sh +exit 101 +EOF + chmod 775 /usr/sbin/policy-rc.d + fi +} +# }}} + # install additional packages {{{ packages() { if [ "$PACKAGES" = 'yes' ] ; then @@ -98,11 +146,11 @@ packages() { # install extra packages {{{ extrapackages() { - if [ "$EXTRAPACKAGES" = 'yes' ] ; then + if [ "$EXTRAPACKAGES" = 'yes' ] ; then PACKAGELIST=$(find /etc/debootstrap/extrapackages -type f -name '*.deb') if [ -n "$PACKAGELIST" ]; then dpkg -i $PACKAGELIST - # run apt again to resolve any deps + # run apt again to resolve any deps DEBIAN_FRONTEND=$DEBIAN_FRONTEND $APTINSTALL fi fi @@ -153,78 +201,20 @@ reconfigure() { # }}} # set password of user root {{{ -setpassword() { -# Set a password, via chpasswd. -# Use perl rather than echo, to avoid the password -# showing in the process table. (However, this is normally -# only called when first booting the system, when root has no -# password at all, so that should be an unnecessary precaution). -# -# Pass in three arguments: the user, the password, and 'true' if the -# password has been pre-crypted (by preseeding). -# -# Taken from /var/lib/dpkg/info/passwd.config - SETPASSWD_PW="$2" - export SETPASSWD_PW - - # This is very annoying. chpasswd cannot handle generating md5 - # passwords as it is not PAM-aware. Thus, I have to work around - # that by crypting the password myself if md5 is used. - USE_MD5=1 - export USE_MD5 - - if [ "$3" = true ]; then - PRECRYPTED=1 - else - PRECRYPTED='' - fi - export PRECRYPTED - LC_ALL=C LANGUAGE=C LANG=C perl -e ' - sub CreateCryptSalt { - my $md5 = shift; - - my @valid = split(//, "./0123456789abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ"); - my ($in, $out); - - my $cryptsaltlen = ($md5 ? 8 : 2); - - open (F, "> /etc/network/interfaces << EOF + +# loopback device: iface lo inet loopback -iface eth0 inet dhcp auto lo -auto eth0 + +# eth0: +# iface eth0 inet dhcp +# auto eth0 + EOF fi } @@ -266,9 +261,9 @@ createfstab(){ echo "Setting up /etc/fstab" cat > /etc/fstab << EOF $TARGET / auto defaults,errors=remount-ro 0 1 -/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 +proc /proc proc defaults 0 0 +/sys /sys sysfs noauto,rw,nosuid,nodev,noexec 0 0 +/dev/cdrom /mnt/cdrom0 iso9660 ro,user,noauto 0 0 # some other examples: # /dev/sda2 none swap sw 0 0 # /dev/hda1 /Grml ext3 dev,suid,user,noauto 0 2 @@ -361,7 +356,9 @@ grub() { # make sure we don't have any running processes left {{{ services() { for service in ssh mdadm mdadm-raid ; do - [ -x "/etc/init.d/$service" ] && "/etc/init.d/$service" stop + if [ -x /etc/init.d/"$service" ] ; then + /etc/init.d/"$service" stop || /bin/true + fi done } # }}} @@ -370,6 +367,7 @@ services() { finalize() { # make sure we don't leave any sensible data rm -f /etc/debootstrap/variables + [ -n "$POLICYRCD" ] && rm -f /usr/sbin/policy-rc.d umount -a 1>/dev/null 2>/dev/null || true umount /proc 1>/dev/null 2>/dev/null || true umount /proc 1>/dev/null 2>/dev/null || true @@ -378,25 +376,13 @@ finalize() { # }}} # execute the functions {{{ - stage chrootmirror && chrootmirror && stage chrootmirror done - stage grmlrepos && grmlrepos && stage grmlrepos done - stage kernelimg_conf && kernelimg_conf && stage kernelimg_conf done - stage makedev && makedev && stage makedev done - stage packages && packages && stage packages done - stage extrapackages && extrapackages && stage extrapackages done - stage mkinitrd && mkinitrd && stage mkinitrd done - stage kernel && kernel && stage kernel done - stage reconfigure && reconfigure && stage reconfigure done - stage hosts && hosts && stage hosts done - stage interfaces && interfaces && stage interfaces done - stage timezone && timezone && stage timezone done - stage fstab && fstab && stage fstab done - stage hostname && hostname && stage hostname done - stage initrd && initrd && stage initrd done - stage grub && grub && stage grub done - stage passwords && passwords && stage passwords done - stage services && services && stage services done - stage finalize && finalize && stage finalize done + for i in chrootmirror grmlrepos kernelimg_conf makedev install_policy_rcd \ + packages extrapackages mkinitrd kernel reconfigure hosts interfaces \ + timezone fstab hostname initrd grub passwords services finalize ; do + if stage $i ; then + $i && stage $i done || exit 1 + fi + done # }}} # finally exit the chroot {{{