X-Git-Url: https://git.grml.org/?p=grml-debootstrap.git;a=blobdiff_plain;f=grml-debootstrap;h=035901c76b7c236b9ccfd0be8b949e620f6344f3;hp=9b8c47d62f7a2544f2530644149614433422f25f;hb=d5528b0241abf8da1700e02bf9b463ca47495ea8;hpb=cb7144264f65932963e9d2968e91b466eab62be2 diff --git a/grml-debootstrap b/grml-debootstrap index 9b8c47d..035901c 100755 --- a/grml-debootstrap +++ b/grml-debootstrap @@ -69,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' @@ -83,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 @@ -116,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 @@ -144,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. @@ -151,6 +157,7 @@ Configuration options: --chroot-scripts Execute chroot scripts from specified directory. --pre-scripts Execute scripts from specified directory (before chroot-scripts). --scripts Execute scripts from specified directory (after chroot-scripts). + --remove-configs Delete grml-debootstrap configuration files from installed system. Other options: @@ -374,7 +381,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' @@ -393,6 +406,12 @@ fi [ "$_opt_force" ] && FORCE=$_opt_force [ "$_opt_verbose" ] && VERBOSE="-v" [ "$_opt_debug" ] && DEBUG="true" +[ "$_opt_remove_configs" ] && REMOVE_CONFIGS="yes" + +# 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 @@ -988,10 +1007,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 :-/ @@ -1105,8 +1133,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 @@ -1134,6 +1160,12 @@ finalize_vm() { # chroot-script skips installation for unset ${GRUB} if [[ -z "${GRUB}" ]] || ! dd if="${GRUB}" bs=512 count=1 2>/dev/null | cat -v | fgrep -q GRUB; then einfo "Installing Grub as bootloader." + + if ! chroot "${MNTPOINT}" dpkg --list grub-pc 2>/dev/null | grep -q '^ii' ; then + echo "Notice: grub-pc package not present yet, installing it therefore." + DEBIAN_FRONTEND=$DEBIAN_FRONTEND chroot "$MNTPOINT" apt-get -y install $DPKG_OPTIONS grub-pc + fi + mkdir -p "${MNTPOINT}/boot/grub" if ! [ -d "${MNTPOINT}"/usr/lib/grub/i386-pc/ ] ; then eerror "Error: grub not installed inside Virtual Machine. Can not install bootloader." ; eend 1 @@ -1160,9 +1192,22 @@ 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 + if grep -q '^GRUB_DISABLE_LINUX_UUID=.*true' "${MNTPOINT}"/etc/default/grub 2>/dev/null ; then + ewarn "GRUB_DISABLE_LINUX_UUID is set to true in /etc/default/grub, not adjusting root= in grub.cfg." + ewarn "Please note that your system might NOT be able to properly boot." + else + einfo "Adjusting grub.cfg for successful boot sequence." + sed -i "s;root=[^ ]\+;root=UUID=$TARGET_UUID;" "${MNTPOINT}"/boot/grub/grub.cfg + fi ;; esac @@ -1228,6 +1273,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" @@ -1251,6 +1297,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" @@ -1283,8 +1330,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} @@ -1371,33 +1420,45 @@ iface eth0 inet dhcp # execute all scripts in /etc/debootstrap/pre-scripts/ {{{ execute_pre_scripts() { - # make sure we have $MNTPOINT available for our scripts - export MNTPOINT - if [ -d "$_opt_pre_scripts" ] || [ "$PRE_SCRIPTS" = 'yes' ] ; then - [ -d "$_opt_pre_scripts" ] && pre_scripts="$_opt_pre_scripts" || pre_scripts="$CONFFILES/pre-scripts/" - for script in ${pre_scripts}/* ; do - if [ -x "$script" ] ; then - einfo "Executing pre-script $script" - $script ; eend $? - fi - done - fi + # make sure hostname is set even before chroot-script get executed + echo "$HOSTNAME" > "$MNTPOINT"/etc/hostname + + # make sure we have $MNTPOINT available for our scripts + export MNTPOINT + + if [ -d "$_opt_pre_scripts" ] || [ "$PRE_SCRIPTS" = 'yes' ] ; then + [ -d "$_opt_pre_scripts" ] && pre_scripts="$_opt_pre_scripts" || pre_scripts="${CONFFILES}/pre-scripts/" + for script in "${pre_scripts}"/* ; do + if [ -x "$script" ] ; then + einfo "Executing pre-script $script" + "$script" ; eend $? + fi + done + fi } # }}} -# 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 } # }}} @@ -1499,10 +1560,27 @@ fscktool() { } # }}} +# get rid of grml-debootstrap config files {{{ +remove_configs() { + if [ "$REMOVE_CONFIGS" != "yes" ] ; then + return 0 + fi + + if ! mountpoint "${MNTPOINT}" ; then + ewarn "Target ${MNTPOINT} doesn't seem to be mounted, can't remove configuration files." ; eend 0 + return 0 + fi + + einfo "Removing configuration files from installed system as requested via --remove-configs / REMOVE_CONFIGS." + rm -rf "${MNTPOINT}"/etc/debootstrap/ + eend $? +} +# }}} + # now execute all the functions {{{ for i in prepare_vm mkfs tunefs mount_target debootstrap_system \ - preparechroot execute_pre_scripts chrootscript execute_scripts \ - umount_chroot finalize_vm fscktool ; do + preparechroot execute_pre_scripts chrootscript execute_post_scripts \ + remove_configs umount_chroot finalize_vm fscktool ; do if stage "${i}" ; then if "$i" ; then stage "${i}" 'done' && rm -f "${STAGES}/${i}"