X-Git-Url: https://git.grml.org/?p=grml-debootstrap.git;a=blobdiff_plain;f=grml-debootstrap;h=5e30e00e423f28e06277c11f60ecaf5fdaf4219f;hp=622a693c452337be48bbd546ed3b012137e70138;hb=6f2677c7fe5fec2aa44856e395264959ced7a3cf;hpb=45247578146cd1c92c73d29c1ce8cd727d3cb6b3 diff --git a/grml-debootstrap b/grml-debootstrap index 622a693..5e30e00 100755 --- a/grml-debootstrap +++ b/grml-debootstrap @@ -6,6 +6,38 @@ # License: This file is licensed under the GPL v2+ ################################################################################ +# error_handler {{{ +[ -n "$REPORT_TRAP_ERR" ] || REPORT_TRAP_ERR='no' +[ -n "$FAIL_TRAP_ERR" ] || FAIL_TRAP_ERR='no' + +error_handler() { + last_exit_code="$?" + last_bash_command="$BASH_COMMAND" + if [ "$REPORT_TRAP_ERR" = "yes" ]; then + echo "Unexpected non-zero exit code $last_exit_code in $BASH_SOURCE at line $BASH_LINENO detected! +last bash command: $last_bash_command" + fi + if [ ! "$FAIL_TRAP_ERR" = "yes" ]; then + return + fi + ## Check if "bailout" function is available. + ## This is not the case in chroot-script. + if command -v bailout >/dev/null 2>&1; then + bailout 1 + else + echo 'FAIL_TRAP_ERR is set to "yes", exit 1.' + exit 1 + fi +} + +if [ "$REPORT_TRAP_ERR" = "yes" ] || [ "$FAIL_TRAP_ERR" = "yes" ]; then + set -E + set -o pipefail + trap "error_handler" ERR + export -f "error_handler" +fi +# }}} + # variables {{{ PN="$(basename "$0")" if [[ -d "$(dirname "$(which "$0")")"/.git ]]; then @@ -37,6 +69,7 @@ MNTPOINT="/mnt/debootstrap.$$" [ -n "$MKFS" ] || MKFS='mkfs.ext4' [ -n "$MKFS_OPTS" ] || MKFS_OPTS='' [ -n "$PACKAGES" ] || PACKAGES='yes' +[ -n "$POST_SCRIPTS" ] || POST_SCRIPTS='yes' [ -n "$PRE_SCRIPTS" ] || PRE_SCRIPTS='yes' [ -n "$RECONFIGURE" ] || RECONFIGURE='console-data' [ -n "$RELEASE" ] || RELEASE='jessie' @@ -51,6 +84,7 @@ MNTPOINT="/mnt/debootstrap.$$" # inside the chroot system locales might not be available, so use minimum: export LANG=C export LC_ALL=C +export LANGUAGE=C # make sure interactive mode is only executed when # using an empty configuration file or option --interactive @@ -84,10 +118,12 @@ Bootstrap options: Options for Virtual Machine deployment: - --vm Set up a Virtual Machine, instead of plainly installing - to a partition or directory, to be combined with --target, - like: --vm --target /dev/mapper/your-vm-disk - --vmfile Like --vm, but install into a file (raw format). + --vm Set up a Virtual Machine on an existing block device + instead of plainly installing to a partition or + directory. Needs to be combined with --target. + Example: --vm --target /dev/mapper/your-vm-disk + --vmfile Like --vm, but install into a regular file (created by + 'qemu-img create -f raw ...') instead. Example: --vmfile --target /mnt/sda1/qemu.img --vmsize Use specified size for size of VM file (default: 2G). Syntax as supported by qemu-img, like: --vmsize 3G @@ -112,6 +148,8 @@ Configuration options: --grmlrepos Enable Grml's Debian repository (deb.grml.org). --backportrepos Enable Debian's backports repository (backports.debian.org). --keep_src_list Do not overwrite user provided apt sources.list. + --contrib Enable 'contrib' in COMPONENTS (defaults to 'main' only). + --non-free Enable non-free in COMPONENTS (defaults to 'main' only). --hostname Hostname of Debian system. --nopassword Do not prompt for the root password. --password Use specified password as password for user root. @@ -342,7 +380,13 @@ fi [ "$_opt_packages_set" ] && PACKAGES='yes' [ "$_opt_nopackages" ] && PACKAGES='' [ "$_opt_debconf_set" ] && DEBCONF='yes' -[ "$_opt_scripts_set" ] && SCRIPTS='yes' + +if [ "$_opt_scripts_set" ] ; then + ewarn "Deprecation NOTE: --scripts option is deprecated, please switch to --post-scripts instead." + SCRIPTS='yes' # deprecated since grml-debootstrap >=0.71 +fi + +[ "$_opt_post_scripts_set" ] && POST_SCRIPTS='yes' [ "$_opt_pre_scripts_set" ] && PRE_SCRIPTS='yes' [ "$_opt_chroot_scripts_set" ] && CHROOT_SCRIPTS='yes' [ "$_opt_keep_src_list" ] && KEEP_SRC_LIST='yes' @@ -362,6 +406,11 @@ fi [ "$_opt_verbose" ] && VERBOSE="-v" [ "$_opt_debug" ] && DEBUG="true" +# make sure main is always included +[ -z "$COMPONENTS" ] && COMPONENTS="main" +[ "$_opt_contrib" ] && COMPONENTS="$COMPONENTS contrib" +[ "$_opt_non_free" ] && COMPONENTS="$COMPONENTS non-free" + if [ "$DEBUG" = "true" ] ; then set -x fi @@ -956,10 +1005,19 @@ mkfs() { # make sure /dev/disk/by-uuid/... is up2date, otherwise grub # will fail to detect the uuid in the chroot - if echo "$TARGET" | grep -q "/dev/md" ; then + if [ -n "$VIRTUAL" ] ; then + einfo "Virtual environment doesn't require blockdev --rereadpt, skipping therefore" + elif echo "$TARGET" | grep -q "/dev/md" ; then blockdev --rereadpt "${TARGET}" - elif ! [ -n "$VIRTUAL" ] ; then - blockdev --rereadpt "${TARGET%%[0-9]*}" + else + # if we deploy to /dev/sdX# then let's see if /dev/sdX exists + local main_device="${TARGET%%[0-9]*}" + # sanity check to not try to e.g. access /dev/loop if we get /dev/loop0 + if [ -f "/sys/block/$(basename ${main_device})/$(basename ${TARGET})/dev" ] ; then + blockdev --rereadpt "$main_device" + else + einfo "No underlying block device for $TARGET identified, skipping blockdev --rereadpt." + fi fi # give the system 2 seconds, otherwise we might run into # race conditions :-/ @@ -1073,8 +1131,6 @@ prepare_vm() { LOOP_PART="$(echo "${DEVINFO##add map }" | sed 's/ .*//')" # 'loop1p1' export TARGET="/dev/mapper/$LOOP_PART" # '/dev/mapper/loop1p1' - blockdev --rereadpt "${LOOP}" - if [ -z "$TARGET" ] ; then eerror "Error: target could not be set to according /dev/mapper/* device." ; eend 1 bailout 1 @@ -1128,6 +1184,14 @@ fi chroot "${MNTPOINT}" update-grub case "$RELEASE" in + jessie) + einfo "Applying workaround for GRUB font path bug in jessie (Debian #787685)." + mkdir -p "${MNTPOINT}/boot/grub/fonts/" + cp "${MNTPOINT}/usr/share/grub/unicode.pf2" "${MNTPOINT}/boot/grub/fonts/" + ;; + esac + + case "$RELEASE" in lenny|squeeze|wheezy) einfo "Adjusting grub.cfg for successful boot sequence." sed -i "s;root=[^ ]\+;root=UUID=$TARGET_UUID;" "${MNTPOINT}"/boot/grub/grub.cfg @@ -1196,6 +1260,7 @@ preparechroot() { [ -n "$ARCH" ] && echo "ARCH='$(sed "s,','\\\\'',g" <<<"${ARCH}")'" >> "$CHROOT_VARIABLES" [ -n "$BACKPORTREPOS" ] && echo "BACKPORTREPOS='$(sed "s,','\\\\'',g" <<<"${BACKPORTREPOS}")'" >> "$CHROOT_VARIABLES" [ -n "$CHROOT_SCRIPTS" ] && echo "CHROOT_SCRIPTS='$(sed "s,','\\\\'',g" <<<"${CHROOT_SCRIPTS}")'" >> "$CHROOT_VARIABLES" + [ -n "$COMPONENTS" ] && echo "COMPONENTS='$(sed "s,','\\\\'',g" <<<"${COMPONENTS}")'" >> "$CHROOT_VARIABLES" [ -n "$CONFFILES" ] && echo "CONFFILES='$(sed "s,','\\\\'',g" <<<"${CONFFILES}")'" >> "$CHROOT_VARIABLES" [ -n "$DEBCONF" ] && echo "DEBCONF='$(sed "s,','\\\\'',g" <<<"${DEBCONF}")'" >> "$CHROOT_VARIABLES" [ -n "$DEBIAN_FRONTEND" ] && echo "DEBIAN_FRONTEND='$(sed "s,','\\\\'',g" <<<"${DEBIAN_FRONTEND}")'" >> "$CHROOT_VARIABLES" @@ -1219,6 +1284,7 @@ preparechroot() { [ -n "$NOPASSWORD" ] && echo "NOPASSWORD=\"true\"" >> "$CHROOT_VARIABLES" [ -n "$NOKERNEL" ] && echo "NOKERNEL=\"true\"" >> "$CHROOT_VARIABLES" [ -n "$PACKAGES" ] && echo "PACKAGES='$(sed "s,','\\\\'',g" <<<"${PACKAGES}")'" >> "$CHROOT_VARIABLES" + [ -n "$POST_SCRIPTS" ] && echo "POST_SCRIPTS='$(sed "s,','\\\\'',g" <<<"${POST_SCRIPTS}")'" >> "$CHROOT_VARIABLES" [ -n "$PRE_SCRIPTS" ] && echo "PRE_SCRIPTS='$(sed "s,','\\\\'',g" <<<"${PRE_SCRIPTS}")'" >> "$CHROOT_VARIABLES" [ -n "$RECONFIGURE" ] && echo "RECONFIGURE='$(sed "s,','\\\\'',g" <<<"${RECONFIGURE}")'" >> "$CHROOT_VARIABLES" [ -n "$RELEASE" ] && echo "RELEASE='$(sed "s,','\\\\'',g" <<<"${RELEASE}")'" >> "$CHROOT_VARIABLES" @@ -1251,8 +1317,10 @@ preparechroot() { fi # package selection: - cp $VERBOSE "${_opt_packages:-$CONFFILES/packages}" \ - "${MNTPOINT}"/etc/debootstrap/packages + if [ "$PACKAGES" = 'yes' ] ; then + cp $VERBOSE "${_opt_packages:-$CONFFILES/packages}" \ + "${MNTPOINT}"/etc/debootstrap/packages + fi # debconf preseeding: _opt_debconf=${_opt_debconf:-$CONFFILES/debconf-selections} @@ -1353,19 +1421,27 @@ execute_pre_scripts() { } # }}} -# execute all scripts in /etc/debootstrap/scripts/ {{{ -execute_scripts() { - # make sure we have $MNTPOINT available for our scripts - export MNTPOINT - if [ -d "$_opt_scripts" ] || [ "$SCRIPTS" = 'yes' ] ; then - [ -d "$_opt_scripts" ] && scripts="$_opt_scripts" || scripts="$CONFFILES/scripts/" - for script in ${scripts}/* ; do - if [ -x "$script" ] ; then - einfo "Executing script $script" - $script ; eend $? - fi - done - fi +# execute all scripts in /etc/debootstrap/post-scripts/ {{{ +execute_post_scripts() { + # make sure we have $MNTPOINT available for our scripts + export MNTPOINT + + if [ -d "$_opt_scripts" ] || [ "$SCRIPTS" = 'yes'] ; then + # legacy support for /etc/debootstrap/scripts/ + [ -d "$_opt_scripts" ] && post_scripts="$_opt_scripts" || post_scripts="${CONFFILES}/scripts/" + ewarn "Deprecation NOTE: --scripts/SCRIPTS are deprecated, please switch to --post-scripts/POST_SCRIPTS instead." + elif [ -d "$_opt_post_scripts" ] || [ "$POST_SCRIPTS" = 'yes' ] ; then + [ -d "$_opt_post_scripts" ] && post_scripts="$_opt_post_scripts" || post_scripts="${CONFFILES}/post-scripts/" + fi + + if [ -n "$post_scripts" ] ; then + for script in "${post_scripts}"/* ; do + if [ -x "$script" ] ; then + einfo "Executing post-script $script" + "$script" ; eend $? + fi + done + fi } # }}} @@ -1403,7 +1479,7 @@ chrootscript() { mount --bind /dev "$MNTPOINT"/dev mount --bind /dev/pts "$MNTPOINT"/dev/pts if [ "$DEBUG" = "true" ] ; then - chroot "$MNTPOINT" /bin/sh -x /bin/chroot-script ; RC=$? + chroot "$MNTPOINT" /bin/bash -x /bin/chroot-script ; RC=$? else chroot "$MNTPOINT" /bin/chroot-script ; RC=$? fi @@ -1469,7 +1545,7 @@ fscktool() { # now execute all the functions {{{ for i in prepare_vm mkfs tunefs mount_target debootstrap_system \ - preparechroot execute_pre_scripts chrootscript execute_scripts \ + preparechroot execute_pre_scripts chrootscript execute_post_scripts \ umount_chroot finalize_vm fscktool ; do if stage "${i}" ; then if "$i" ; then