fi
if [ -n "$DIRECTORY" ] ; then
- einfo "Not unmounting $MNTPOINT as you requested me to install into a directory of your own choice." ; eend 0
+ einfo "Not unmounting $MNTPOINT as you requested me to install into a directory of your own choice."
else
einfo "Unmounting $MNTPOINT"
umount "$MNTPOINT"
echo "$2" > "${STAGES}/${1}"
return 0
elif grep -q 'done' "${STAGES}/${1}" 2>/dev/null ; then
- ewarn "Notice: stage $1 has been executed already, skipping execution therefore." ; eend 0
- ewarn " To reexecute it clean up the according directory inside $STAGES" ; eend 0
+ ewarn "Notice: stage $1 has been executed already, skipping execution therefore."
+ ewarn " To reexecute it clean up the according directory inside $STAGES"
return 1
fi
}
fi
[ "$_opt_help" ] && {
- usage ; eend 0
- eend 0
+ usage
exit 0
}
[ "$_opt_version" ] && {
einfo "$PN - version $VERSION"
einfo "Report bugs via https://github.com/grml/grml-debootstrap/ or https://grml.org/bugs/"
- eend 0
exit 0
}
# }}}
fi
if fsck.vfat -bn "$EFI" >/dev/null; then
- einfo "EFI partition $EFI seems to have a FAT filesystem, not modifying." ; eend 0
+ einfo "EFI partition $EFI seems to have a FAT filesystem, not modifying."
else
einfo "EFI partition $EFI doesn't seem to be formatted, creating filesystem."
mkfs.fat -F32 -n "EFI" "$EFI"
RC=$?
- if [ $RC -eq 0 ] ; then
- eend 0
- else
+ if [ ! $RC -eq 0 ] ; then
eerror "Error while creating filesystem on ${EFI}."
eend 1
bailout 1
fi
if [ -d /sys/firmware/efi ] ; then
- einfo "EFI support detected." ; eend 0
+ einfo "EFI support detected."
return 0
fi
if efi_support ; then
if [ -z "$_opt_efi" ] ; then
- ewarn "EFI support detected but no --efi option given, please consider enabling it." ; eend 0
+ ewarn "EFI support detected but no --efi option given, please consider enabling it."
fi
else
if [ -n "$_opt_efi" ] ; then
- eerror "EFI option used but no EFI support detected." ; eend 0
+ eerror "EFI option used but no EFI support detected."
bailout 1
fi
fi
if [ -n "$AUTOINSTALL" ] ; then
if checkforrun ; then
- eerror "Exiting as requested" ; eend 0
+ eerror "Exiting as requested"
bailout 1
fi
elif [ -n "$INTERACTIVE" ] ; then
mkfs.ext*)
einfo "Enabling force option (-F) for mkfs.ext* tool as requested via --force switch."
MKFS_OPTS="$MKFS_OPTS -F"
- eend 0
-
;;
esac
fi
if [ -n "$e2fsprogs_version" ] && dpkg --compare-versions "$e2fsprogs_version" ge '1.43~WIP.2015.05.18-1' ; then
einfo "Disabling metadata_csum feature for $MKFS as $RELEASE doesn't support it."
MKFS_OPTS="$MKFS_OPTS -O ^metadata_csum"
- eend 0
fi
;;
esac
if [ -n "$e2fsprogs_version" ] && dpkg --compare-versions "$e2fsprogs_version" ge '1.43' ; then
einfo "Disabling metadata_csum_seed feature for $MKFS as $RELEASE doesn't support it."
MKFS_OPTS="$MKFS_OPTS -O ^metadata_csum_seed"
- eend 0
fi
;;
esac
bailout 1
else
einfo "Changing disk uuid for $TARGET to fixed (non-random) value $DISK_IDENTIFIER using tune2fs"
- tune2fs "$TARGET" -U "$DISK_IDENTIFIER"
+ tune2fs "$TARGET" -U "$DISK_IDENTIFIER" </dev/null
eend $?
fi
fi
tunefs() {
if [ -n "$TUNE2FS" ] && echo "$MKFS" | grep -q "mkfs.ext" ; then
einfo "Disabling automatic filesystem check on $TARGET via tune2fs"
- $TUNE2FS "$TARGET"
+ $TUNE2FS "$TARGET" </dev/null
eend $?
fi
}
einfo "Running grml-debootstrap on a directory, nothing to mount."
else
if grep -q "$TARGET" /proc/mounts ; then
- ewarn "$TARGET already mounted, continuing anyway." ; eend 0
+ ewarn "$TARGET already mounted, continuing anyway."
else
if ! [ -d "${MNTPOINT}" ] ; then
[ -n "$VIRTUAL" ] || mkdir -p "${MNTPOINT}"
parted -s "${TARGET}" 'mklabel gpt'
parted -s "${TARGET}" 'mkpart ESP fat32 1MiB 101MiB'
parted -s "${TARGET}" 'set 1 boot on'
- parted -s "${TARGET}" 'mkpart primary ext4 101MiB 100%'
+ parted -s "${TARGET}" 'mkpart bios_grub 101MiB 102MiB'
+ parted -s "${TARGET}" 'set 2 bios_grub on'
+ parted -s "${TARGET}" 'mkpart primary ext4 102MiB 100%'
+
else
parted -s "${TARGET}" 'mklabel msdos'
if [ "$FIXED_DISK_IDENTIFIERS" = "yes" ] ; then
eend $?
fi
parted -s "${TARGET}" 'mkpart primary ext4 4MiB 100%'
+ parted -s "${TARGET}" 'set 1 boot on'
fi
- parted -s "${TARGET}" 'set 1 boot on'
DEVINFO=$(kpartx -asv "$TARGET") # e.g. 'add map loop0p1 (254:5): 0 20477 linear 7:0 3'
if [ -z "${DEVINFO}" ] ; then
LOOP_PART="${LOOP_PART// */}" # 'loop0p1'
if [ -n "$VMEFI" ]; then
export EFI_TARGET="/dev/mapper/$LOOP_PART" # '/dev/mapper/loop0p1'
- LOOP_PART="${LOOP_PART%p1}p2"
+ LOOP_PART="${LOOP_PART%p1}p3"
fi
LOOP_DISK="${LOOP_PART%p*}" # 'loop0'
export TARGET="/dev/mapper/$LOOP_PART" # '/dev/mapper/loop1p1'
DEBIAN_FRONTEND=$DEBIAN_FRONTEND chroot "$MNTPOINT" apt-get -y --no-install-recommends install $DPKG_OPTIONS grub-efi-ia32-bin grub-efi-ia32-signed
fi
chroot "$MNTPOINT" grub-install --target=i386-efi --efi-directory=/boot/efi --uefi-secure-boot --removable "/dev/$LOOP_DISK"
+ chroot "$MNTPOINT" grub-install --target=i386-pc "/dev/$LOOP_DISK"
else
if ! chroot "${MNTPOINT}" dpkg --list grub-efi-amd64-signed 2>/dev/null | grep -q '^ii' ; then
echo "Notice: grub-efi-amd64-signed package not present yet, installing it therefore."
DEBIAN_FRONTEND=$DEBIAN_FRONTEND chroot "$MNTPOINT" apt-get -y --no-install-recommends install $DPKG_OPTIONS grub-efi-amd64-bin grub-efi-amd64-signed
fi
chroot "$MNTPOINT" grub-install --target=x86_64-efi --efi-directory=/boot/efi --uefi-secure-boot --removable "/dev/$LOOP_DISK"
+ chroot "$MNTPOINT" grub-install --target=i386-pc "/dev/$LOOP_DISK"
fi
else
dd if="${MNTPOINT}/usr/lib/grub/i386-pc/boot.img" of="${ORIG_TARGET}" conv=notrunc bs=440 count=1
fi
if [ -n "$NOINTERFACES" ] ; then
- einfo "Not installing /etc/network/interfaces as requested via --nointerfaces option" ; eend 0
+ einfo "Not installing /etc/network/interfaces as requested via --nointerfaces option"
elif [ -n "$USE_DEFAULT_INTERFACES" ] ; then
einfo "Installing default /etc/network/interfaces as requested via --defaultinterfaces options."
mkdir -p "${MNTPOINT}/etc/network"
einfo "Use locally available public keys to authorise root login on the target system as requested via --sshcopyid option."
mkdir -p "${MNTPOINT}"/root/.ssh
chmod 0700 "${MNTPOINT}"/root/.ssh
- if ssh-add -L >> "${MNTPOINT}"/root/.ssh/authorized_keys ; then
- eend 0
- else
+ if ! ssh-add -L >> "${MNTPOINT}"/root/.ssh/authorized_keys ; then
eerror "Error: executing 'ssh-add -L' failed."
eend 1
bailout 1
einfo "copying '$AUTHORIZED_KEYS_SOURCE' to '$AUTHORIZED_KEYS_TARGET' as requested via --sshcopyid option."
mkdir -p "$AUTHORIZED_KEYS_TARGET"
chmod 0700 "$AUTHORIZED_KEYS_TARGET"
- if cp "$AUTHORIZED_KEYS_SOURCE" "$AUTHORIZED_KEYS_TARGET" ; then
- eend 0
- else
+ if ! cp "$AUTHORIZED_KEYS_SOURCE" "$AUTHORIZED_KEYS_TARGET" ; then
eerror "Error: copying '$AUTHORIZED_KEYS_SOURCE' to '$AUTHORIZED_KEYS_TARGET' failed"
eend 1
bailout 1
einfo "Copying '${AUTHORIZED_KEYS_SOURCE}' to '${AUTHORIZED_KEYS_TARGET}' as requested via --sshcopyauth option."
mkdir -p "${AUTHORIZED_KEYS_TARGET}"
chmod 0700 "${AUTHORIZED_KEYS_TARGET}"
- if cp "${AUTHORIZED_KEYS_SOURCE}" "${AUTHORIZED_KEYS_TARGET}" ; then
- eend 0
- else
+ if ! cp "${AUTHORIZED_KEYS_SOURCE}" "${AUTHORIZED_KEYS_TARGET}" ; then
eerror "Error: copying '${AUTHORIZED_KEYS_SOURCE}' to '${AUTHORIZED_KEYS_TARGET}' failed."
eend 1
bailout 1
mount --bind /run/udev "${MNTPOINT}"/run/udev
eend $?
fi
-
- eend 0
}
# }}}
eend $?
else
einfo "Keeping chroot-script as string GRML_CHROOT_SCRIPT_MARKER could not be found"
- eend 0
fi
}
# }}}
fi
if ! mountpoint "${MNTPOINT}" >/dev/null 2>&1 ; then
- ewarn "Target ${MNTPOINT} doesn't seem to be mounted, can't remove configuration files." ; eend 0
+ ewarn "Target ${MNTPOINT} doesn't seem to be mounted, can't remove configuration files."
return 0
fi
noeject noprompt reboot
fi
else
- einfo "Finished execution of ${PN}. Enjoy your Debian system." ; eend 0
+ einfo "Finished execution of ${PN}. Enjoy your Debian system."
fi
# }}}