X-Git-Url: https://git.grml.org/?p=grml-debootstrap.git;a=blobdiff_plain;f=chroot-script;h=2be4689c654c5250dc43cdb4e6ad07113a225386;hp=3cd219608f806944f75fb7510ca5b7176eab6df7;hb=c2f80ef4cb996ef77d2486d0db91f1e03abf6ac3;hpb=41260b2bb817765667a4d816d56306574f5ca691 diff --git a/chroot-script b/chroot-script index 3cd2196..2be4689 100755 --- a/chroot-script +++ b/chroot-script @@ -4,7 +4,6 @@ # 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 Apr 28 20:19:58 CEST 2007 [mika] ################################################################################ set -e # exit on any error @@ -12,13 +11,13 @@ 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 {{{ # use aptitude only if it's available if [ -x /usr/bin/aptitude ] ; then - APTINSTALL='aptitude -y install ' + APTINSTALL='aptitude -y --without-recommends install ' APTUPDATE='aptitude update' else APTINSTALL='apt-get --force-yes -y install' @@ -45,6 +44,7 @@ stage() { # define chroot mirror {{{ chrootmirror() { + [ -n "$KEEP_SRC_LIST" ] && return 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 @@ -59,7 +59,9 @@ chrootmirror() { # set up grml repository {{{ grmlrepos() { if [ -n "$GRMLREPOS" ] ; then - cat >> /etc/apt/sources.list << EOF + # user might have provided their own apt sources.list + if ! grep -q grml /etc/apt/sources.list 2>/dev/null ; then + cat >> /etc/apt/sources.list << EOF # grml: stable repository: deb http://deb.grml.org/ grml-stable main @@ -70,6 +72,8 @@ grmlrepos() { deb-src http://deb.grml.org/ grml-testing main EOF + fi + # 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 @@ -117,15 +121,35 @@ 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() { + # Pre-seed the debconf database with answers. Each question will be marked + # as seen to prevent debconf from asking the question interactively. + [ -f /etc/debootstrap/debconf-selections ] && { + echo "Preseeding the debconf database, some lines might be skipped..." + cat /etc/debootstrap/debconf-selections | debconf-set-selections + } + if [ "$PACKAGES" = 'yes' ] ; then if ! [ -r /etc/debootstrap/packages ] ; then echo "Error: /etc/debootstrap/packages not found, exiting." exit 1 else $APTUPDATE - DEBIAN_FRONTEND=$DEBIAN_FRONTEND $APTINSTALL $(cat /etc/debootstrap/packages) $GRMLPACKAGES + DEBIAN_FRONTEND=$DEBIAN_FRONTEND $APTINSTALL $(grep -v '^#' /etc/debootstrap/packages) $GRMLPACKAGES fi fi } @@ -188,78 +212,35 @@ 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 @@ -306,11 +285,16 @@ timezone() { # helper function for fstab() {{{ 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 +if [ -n "$TARGET_UUID" ] ; then + echo "/dev/disk/by-uuid/${TARGET_UUID} / auto defaults,errors=remount-ro 0 1" > /etc/fstab +else + echo "${TARGET} / auto defaults,errors=remount-ro 0 1" > /etc/fstab +fi + +cat >> /etc/fstab << EOF +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 @@ -340,6 +324,11 @@ hostname() { if [ -n "$HOSTNAME" ] ; then echo "Setting hostname to ${HOSTNAME}." echo "$HOSTNAME" > /etc/hostname + + # adjust postfix configuration + if [ -r /etc/postfix/main.cf ] ; then + sed -i "s/grml/$HOSTNAME/g" /etc/postfix/main.cf + fi fi } # }}} @@ -391,7 +380,11 @@ grub() { $UPDATEGRUB -y if [ -f /boot/grub/menu.lst ] ; then sed -i "s/^# groot=.*/# groot=(${GROOT})/g" /boot/grub/menu.lst - sed -i "s|^# kopt=root=.*|# kopt=root=${TARGET} ro ${BOOT_APPEND}|g" /boot/grub/menu.lst + if [ -n "$TARGET_UUID" ] ; then + sed -i "s|^# kopt=root=.*|# kopt=root=UUID=${TARGET_UUID} ro ${BOOT_APPEND}|g" /boot/grub/menu.lst + else + sed -i "s|^# kopt=root=.*|# kopt=root=${TARGET} ro ${BOOT_APPEND}|g" /boot/grub/menu.lst + fi # not sure why savedefault does not work for me; any ideas? sed -i "s/^savedefault.*/# &/g" /boot/grub/menu.lst $UPDATEGRUB -y @@ -414,6 +407,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 @@ -422,9 +416,9 @@ finalize() { # }}} # execute the functions {{{ - for i in chrootmirror grmlrepos kernelimg_conf makedev packages extrapackages \ - mkinitrd kernel reconfigure hosts interfaces timezone fstab hostname \ - initrd grub passwords services finalize ; do + 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