X-Git-Url: https://git.grml.org/?p=grml-debootstrap.git;a=blobdiff_plain;f=chroot-script;h=17447ff6a6de1e998e29207c6bc62e081f3b7735;hp=5ca8295500bbffc85d89d8d18b7e613a94a0aba2;hb=840f5b81bb6a0749a8f5360355f199d9655e9a1a;hpb=3d63d4407d8113260e4c2e2965699c0c6b280d09 diff --git a/chroot-script b/chroot-script index 5ca8295..17447ff 100755 --- a/chroot-script +++ b/chroot-script @@ -42,6 +42,15 @@ stage() { echo " Executing stage ${1}" return 0 } + +askpass() { + # read -s emulation for dash. result is in $resp. + set -o noglob + stty -echo + read resp + stty echo + set +o noglob +} # }}} # define chroot mirror {{{ @@ -51,7 +60,7 @@ chrootmirror() { if [ -n "$ISO" ] ; then echo "deb $ISO $RELEASE $COMPONENTS" > /etc/apt/sources.list - [ -n "$MIRROR" ] && echo "deb $MIRROR $RELEASE $COMPONENTS" >> /etc/apt/sources.list || /bin/true + [ -n "$MIRROR" ] && echo "deb $MIRROR $RELEASE $COMPONENTS" >> /etc/apt/sources.list || true else if [ -n "$MIRROR" ] ; then echo "deb $MIRROR $RELEASE $COMPONENTS" > /etc/apt/sources.list @@ -64,8 +73,8 @@ chrootmirror() { grmlrepos() { if [ -n "$GRMLREPOS" ] ; then # 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 + if ! grep -q grml /etc/apt/sources.list.d/grml.list 2>/dev/null ; then + cat >> /etc/apt/sources.list.d/grml.list << EOF # grml: stable repository: deb http://deb.grml.org/ grml-stable main @@ -78,10 +87,15 @@ grmlrepos() { 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 - # why it's necessary, sometimes we get an error even though it works [mika] + if apt-get update ; then + apt-get -y --allow-unauthenticated install grml-debian-keyring + apt-get update + else + # make sure we have the keys available for aptitude + gpg --keyserver subkeys.pgp.net --recv-keys F61E2E7CECDEA787 + gpg --export F61E2E7CECDEA787 | apt-key add - || true # not yet sure + # why it's necessary, sometimes we get an error even though it works [mika] + fi # make sure we install packages from grml's pool only if not available # from Debian! @@ -116,15 +130,6 @@ EOF } # }}} -# create default devices {{{ -makedev() { - if ! [ -r /dev/hda20 ] ; then - echo "Creating generic devices in /dev - this might take a while..." - cd /dev && MAKEDEV generic - fi -} -# }}} - # make sure services do not start up {{{ install_policy_rcd() { if ! [ -r /usr/sbin/policy-rc.d ] ; then @@ -138,6 +143,17 @@ EOF } # }}} +# remove now useless apt cache {{{ +remove_apt_cache() { + if [ "$RM_APTCACHE" = 'yes' ] ; then + echo "Cleaning apt cache." + apt-get clean + else + echo "Not cleaning apt cache as \$RM_APTCACHE is unset." + fi +} +# }}} + # install additional packages {{{ packages() { # Pre-seed the debconf database with answers. Each question will be marked @@ -172,14 +188,6 @@ extrapackages() { } # }}} -# sarge specific stuff: mkinitrd {{{ -mkinitrd() { - if [ "$RELEASE" = 'sarge' ] ; then - sed -i "s#ROOT=probe#ROOT=$TARGET#" /etc/mkinitrd/mkinitrd.conf - fi -} -# }}} - # install kernel packages {{{ kernel() { # do not override $KERNEL if set via config file @@ -193,13 +201,9 @@ kernel() { if [ -n "$KERNEL" ] ; then $APTUPDATE - if [ "$RELEASE" = 'sarge' ] ; then - KERNELPACKAGES="kernel-image-$KERNEL kernel-headers-$KERNEL" - else - # note: install busybox to be able to debug initramfs - KERNELPACKAGES="linux-image-$KERNEL linux-headers-$KERNEL busybox" - fi - DEBIAN_FRONTEND=$DEBIAN_FRONTEND $APTINSTALL $KERNELPACKAGES + # note: install busybox to be able to debug initramfs + KERNELPACKAGES="linux-image-$KERNEL linux-headers-$KERNEL busybox firmware-linux" + DEBIAN_FRONTEND=$DEBIAN_FRONTEND $APTINSTALL $KERNELPACKAGES fi } # }}} @@ -237,10 +241,14 @@ passwords() echo "Setting password for user root:" while [ "$a" != "$b" ] ; do echo -n "Enter new UNIX password for user root: " - read -s a + askpass + a="$resp" + unset resp echo echo -n "Retype new UNIX password for user root: " - read -s b + askpass + b="$resp" + unset resp echo if [ "$a" != "$b" ] ; then echo "Sorry, passwords do not match. Retry." @@ -323,11 +331,12 @@ 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/sda2 none swap sw,pri=0 0 0 # /dev/hda1 /Grml ext3 dev,suid,user,noauto 0 2 # //1.2.3.4/pub /smb/pub smbfs defaults,user,noauto,uid=grml,gid=grml 0 0 # linux:/pub /beer nfs defaults 0 0 # tmpfs /tmp tmpfs size=300M 0 0 +# /dev/sda5 none swap sw 0 0 EOF } # }}} @@ -356,8 +365,6 @@ hostname() { if [ -r /etc/postfix/main.cf ] ; then # adjust hostname related options: sed -i "s/grml/$HOSTNAME/g" /etc/postfix/main.cf - sed -i "s/^myhostname = .*/myhostname = $HOSTNAME/" /etc/postfix/main.cf - sed -i "s/^mydestination = .*/mydestination = localdomain, localhost, localhost.localdomain, $HOSTNAME/" /etc/postfix/main.cf # listen on loopback interface only: sed -i "s/^inet_interfaces = .*/inet_interfaces = loopback-only/" /etc/postfix/main.cf @@ -380,64 +387,49 @@ initrd() { # generate initrd if [ -n "$INITRD" ] ; then - 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 + echo "Generating initrd." + update-initramfs -c -t -k $KERNELVER fi } # }}} # grub configuration/installation {{{ -grub() { - if [ -z "$GROOT" ] ; then - echo "Warning: \$GROOT is not defined, will not adjust grub configuration therefore." +grub_install() { + + if [ -z "$GRUB" ] ; then + echo "Notice: \$GRUB not defined, will not install grub therefore." + return 0 + fi + + if ! [ -x "$(which grub-install)" ] ; then + echo "Error: grub-install not available. (Error while installing grub package?)" >&2 + return 1 + fi + + if [ -n "$SELECTED_PARTITIONS" ] ; then # using sw-raid + for device in $SELECTED_PARTITIONS ; do + GRUB="${device%%[0-9]}" + echo "Installing grub on ${GRUB}:" + grub-install --no-floppy "$GRUB" + done else - echo "Adjusting grub configuration for use on ${GROOT}." - - # copy stage-files to /boot/grub/ - [ -d /boot/grub/ ] || mkdir /boot/grub - # i386 specific: - [ -d /usr/lib/grub/i386-pc ] && cp /usr/lib/grub/i386-pc/* /boot/grub/ - # amd64 specific: - [ -d /usr/lib/grub/x86_64-pc ] && cp /usr/lib/grub/x86_64-pc/* /boot/grub/ - # sarge ships grub files in another directory - [ "$RELEASE" = 'sarge' ] && cp /lib/grub/i386-pc/* /boot/grub/ - - # finally install grub - if [ -x /usr/sbin/update-grub ] ; then - UPDATEGRUB='/usr/sbin/update-grub' - else - UPDATEGRUB='/sbin/update-grub' - fi - $UPDATEGRUB -y - if [ -f /boot/grub/menu.lst ] ; then - sed -i "s/^# groot=.*/# groot=(${GROOT})/g" /boot/grub/menu.lst - case "$TARGET" in - # do NOT use uuid with SW-RAID - /dev/md*) - 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 - ;; - esac - - # not sure why savedefault does not work for me; any ideas? - sed -i "s/^savedefault.*/# &/g" /boot/grub/menu.lst - $UPDATEGRUB -y - fi + echo "Installing grub on ${GRUB}:" + grub-install --no-floppy "$GRUB" + fi + + echo "Adjusting grub configuration for use on ${GRUB}." + + # finally install grub + if [ -x /usr/sbin/update-grub ] ; then + UPDATEGRUB='/usr/sbin/update-grub' + elif [ -x /sbin/update-grub ] ; then + UPDATEGRUB='/sbin/update-grub' + else + echo "Error: update-grub not available, can not execute it." >&2 + return 1 fi + + $UPDATEGRUB } # }}} @@ -456,28 +448,44 @@ custom_scripts() { services() { for service in ssh mdadm mdadm-raid ; do if [ -x /etc/init.d/"$service" ] ; then - /etc/init.d/"$service" stop || /bin/true + /etc/init.d/"$service" stop || true fi done } # }}} -# unmount all filesystems in chroot, make sure nothing is left {{{ +# unmount /proc and make sure nothing is left {{{ 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 - umount -a 1>/dev/null 2>/dev/null || true + + umount /proc >/dev/null 2>/dev/null || true +} +# }}} + +# signal handler {{{ +signal_handler() { + finalize + [ -n "$1" ] && EXIT="$1" || EXIT="1" + exit "$EXIT" } # }}} +# set signal handler {{{ +trap signal_handler HUP INT QUIT TERM +# }}} + # execute the functions {{{ - for i in chrootmirror grmlrepos kernelimg_conf makedev install_policy_rcd \ - kernel packages extrapackages mkinitrd reconfigure hosts interfaces \ - timezone fstab hostname initrd grub passwords custom_scripts services ; do + + # always execute install_policy_rcd + install_policy_rcd + + for i in chrootmirror grmlrepos kernelimg_conf \ + kernel packages extrapackages reconfigure hosts interfaces \ + timezone fstab hostname initrd grub_install passwords \ + custom_scripts remove_apt_cache services ; do if stage $i ; then $i && stage $i done || exit 1 fi