# variables {{{
PN="$(basename "$0")"
-if [[ -d "$(dirname "$(which "$0")")"/.git ]]; then
+if [[ -d "$(dirname "$(command -v "$0")")"/.git ]]; then
VERSION="$(git describe | sed 's|^v||')"
else
VERSION="$(dpkg-query --show --showformat='${Version}' "$PN")"
[ -n "$DEFAULT_LOCALES" ] || DEFAULT_LOCALES='en_US.UTF-8'
[ -n "$DISK_IDENTIFIER" ] || DISK_IDENTIFIER='26ada0c0-1165-4098-884d-aafd2220c2c6'
[ -n "$EXTRAPACKAGES" ] || EXTRAPACKAGES='yes'
-[ -n "$FALLBACK_MIRROR" ] || FALLBACK_MIRROR='http://httpredir.debian.org/debian'
+[ -n "$FALLBACK_MIRROR" ] || FALLBACK_MIRROR='http://deb.debian.org/debian'
[ -n "$FIXED_DISK_IDENTIFIERS" ] || FIXED_DISK_IDENTIFIERS="no"
[ -n "$FORCE" ] || FORCE=''
[ -n "$HOSTNAME" ] || HOSTNAME='grml'
[ -n "$TUNE2FS" ] || TUNE2FS='tune2fs -c0 -i0'
[ -n "$UPGRADE_SYSTEM" ] || UPGRADE_SYSTEM='yes'
[ -n "$VMSIZE" ] || VMSIZE="2G"
+[ -n "$GRUB_INSTALL" ] || GRUB_INSTALL='yes'
# inside the chroot system locales might not be available, so use minimum:
export LANG=C
NORMAL='\e[0m'
einfo() {
- einfon "$1\n"
+ einfon "$1\\n"
return 0
}
}
ewarn() {
- printf " %s*%s $*\n" "${WARN}" "${NORMAL}"
+ printf " %s*%s $*\\n" "${WARN}" "${NORMAL}"
return 0
}
eerror() {
[ "${RC_ENDCOL}" != "yes" ] && [ "${LAST_E_CMD}" = "ebegin" ] && echo
- printf " %s*%s $*\n" "${BAD}" "${NORMAL}" >&2
+ printf " %s*%s $*\\n" "${BAD}" "${NORMAL}" >&2
LAST_E_CMD=eerror
return 0
}
local retval="${1:-0}"
shift
if [ "$retval" -gt 0 ]; then
- printf " %s-> Failed (rc=%s)%s\n" "${BAD}" "${retval}" "${NORMAL}"
+ printf " %s-> Failed (rc=%s)%s\\n" "${BAD}" "${retval}" "${NORMAL}"
fi
return "$retval"
}
check4progs(){
local RC=''
for arg in "$@" ; do
- which "$arg" >/dev/null 2>&1 || RC="$arg"
+ command -v "$arg" >/dev/null 2>&1 || RC="$arg"
done
if [ -n "$RC" ] ; then
echo "$RC not installed"
if [ -n "${ORIG_TARGET}" ] ; then
einfo "Removing loopback mount of file ${ORIG_TARGET}."
- kpartx -d "${ORIG_TARGET}" ; eend $?
+ kpartx -d "${ORIG_TARGET}"
+ # Workaround for a bug in kpartx which doesn't clean up properly,
+ # see Debian Bug #891077 and Github-PR grml/grml-debootstrap#112
+ if dmsetup ls | grep -q "^${LOOP_PART} "; then
+ kpartx -d "/dev/${LOOP_DISK}" >/dev/null
+ fi
+ eend $?
fi
}
# == Other options
--verbose|-v) # Increase verbosity
- if [ "$_opt_verbose" ]; then _opt_verbose=`expr $_opt_verbose + 1`
- else _opt_verbose=1; fi
+ if [ "$_opt_verbose" ]; then
+ _opt_verbose=$( _opt_verbose + 1 )
+ else
+ _opt_verbose=1
+ fi
;;
--debug) # Execute in debug mode
_opt_debug=T
[ $? -eq 0 ] || bailout
if [ "$CHOOSE_MIRROR" = 'net' ] ; then
- [ -n "$MIRROR" ] || MIRROR='http://httpredir.debian.org/debian'
+ [ -n "$MIRROR" ] || MIRROR='http://deb.debian.org/debian'
MIRROR="$(dialog --stdout --title "${PN}" --inputbox \
"Please enter Debian mirror you would like to use for installing packages." \
0 0 $MIRROR)"
if [ -b "$TARGET" ] || [ -n "$VIRTUAL" ] ; then
PARTITION=1
else
+ # $TARGET was not detected as block device, but we do not want to create target directory in /dev/
+ if [[ $TARGET == "/dev/"* ]]; then
+ eerror "Error: Will not create target directory $TARGET in /dev."
+ eerror " Please check the partition(s) of the blockdevice."; eend 1
+ bailout 1
+ fi
set_target_directory
fi
# }}}
bailout 1
fi
+ # make sure loop module is present and a usable loop device exists
+ modprobe -q loop
+ if ! losetup -f >/dev/null 2>&1; then
+ eerror "Error finding usable loop device" ; eend 1
+ bailout 1
+ fi
+
+ # if dm-mod isn't available then kpartx will fail with
+ # "Is device-mapper driver missing from kernel? [...]"
+ modprobe -q dm-mod
+ if ! grep -q 'device-mapper' /proc/misc >/dev/null 2>&1 ; then
+ eerror "Device-mapper support missing in kernel." ; eend 1
+ bailout 1
+ fi
+
ORIG_TARGET="$TARGET" # store for later reuse
if [ -n "$VMFILE" ]; then
einfo "Adjusting disk signature to a fixed (non-random) value"
MBRTMPFILE=$(mktemp)
dd if="${TARGET}" of="${MBRTMPFILE}" bs=512 count=1
- echo -en "\x41\x41\x41\x41" | dd of="${MBRTMPFILE}" conv=notrunc seek=440 bs=1
+ echo -en "\\x41\\x41\\x41\\x41" | dd of="${MBRTMPFILE}" conv=notrunc seek=440 bs=1
dd if="${MBRTMPFILE}" of="${TARGET}" conv=notrunc
eend $?
fi
parted -s "${TARGET}" 'mkpart primary ext4 2M -1'
parted -s "${TARGET}" 'set 1 boot on'
- # if dm-mod isn't available then kpartx will fail with
- # "Is device-mapper driver missing from kernel? [...]"
- if ! kpartx -av "$TARGET" >/dev/null 2>&1 || ! grep -q 'device-mapper' /proc/misc >/dev/null 2>&1 ; then
- einfo "Device-mapper not ready yet, trying to load dm-mod module."
- modprobe dm-mod ; eend $?
- fi
-
- # make sure loop module is present
- if ! losetup -f >/dev/null 2>&1; then
- einfo "Can not find a usable loop device, retrying after loading loop module."
- modprobe loop
- if losetup -f >/dev/null 2>&1; then
- einfo "Found a usable loop device now, continuing."
- else
- eerror "Error finding usable loop device" ; eend 1
- bailout 1
- fi
- fi
-
DEVINFO=$(kpartx -asv "$TARGET") # e.g. 'add map loop0p1 (254:5): 0 20477 linear 7:0 3'
if [ -z "${DEVINFO}" ] ; then
eerror "Error setting up loopback device." ; eend 1
# hopefully this always works as expected
LOOP_PART="${DEVINFO##add map }" # 'loop0p1 (254:5): 0 20477 linear 7:0 3'
LOOP_PART="${LOOP_PART// */}" # 'loop0p1'
+ LOOP_DISK="${LOOP_PART%p*}" # 'loop0'
export TARGET="/dev/mapper/$LOOP_PART" # '/dev/mapper/loop1p1'
if [ -z "$TARGET" ] ; then
}
# }}}
-# make VM image bootable and unmount it {{{
-finalize_vm() {
+# make VM image bootable {{{
+grub_install() {
if [ -z "${VIRTUAL}" ] ; then
return 0
fi
+ if [ "${GRUB_INSTALL}" != "yes" ] ; then
+ einfo "Not installing GRUB as requested via \$GRUB_INSTALL=$GRUB_INSTALL"
+ return 0
+ fi
if ! mount "${TARGET}" "${MNTPOINT}" ; then
eerror "Error: Mounting ${TARGET} failed, can not continue." ; eend 1
# Has chroot-script installed GRUB to MBR using grub-install (successfully), already?
# 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
+if [[ -z "${GRUB}" ]] || ! dd if="${GRUB}" bs=512 count=1 2>/dev/null | cat -v | grep -Fq GRUB; then
einfo "Installing Grub as bootloader."
if ! chroot "${MNTPOINT}" dpkg --list grub-pc 2>/dev/null | grep -q '^ii' ; then
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
+ sed -i "s;root=[^ ]\\+;root=UUID=$TARGET_UUID;" "${MNTPOINT}"/boot/grub/grub.cfg
fi
umount "${MNTPOINT}"/proc
umount "${MNTPOINT}"/sys
umount "${MNTPOINT}"/dev/pts
try_umount 3 "${MNTPOINT}"/dev
+
+}
+# }}}
+
+# unmount VM image {{{
+umount_target() {
+ if [ -z "${VIRTUAL}" ] ; then
+ return 0
+ fi
+
umount "${MNTPOINT}"
kpartx -d "${ORIG_TARGET}" >/dev/null
+ # Workaround for a bug in kpartx which doesn't clean up properly,
+ # see Debian Bug #891077 and Github-PR grml/grml-debootstrap#112
+ if dmsetup ls | grep -q "^${LOOP_PART} "; then
+ kpartx -d "/dev/${LOOP_DISK}" >/dev/null
+ fi
}
# }}}
for i in format_efi_partition prepare_vm mkfs tunefs \
mount_target mountpoint_to_blockdevice debootstrap_system \
preparechroot execute_pre_scripts chrootscript execute_post_scripts \
- remove_configs umount_chroot finalize_vm fscktool ; do
+ remove_configs umount_chroot grub_install umount_target fscktool ; do
if stage "${i}" ; then
if "$i" ; then
stage "${i}" 'done' && rm -f "${STAGES}/${i}"