# define chroot mirror {{{
chrootmirror() {
- if [ -n "$KEEP_SRC_LIST" ] ; then
- echo "KEEP_SRC_LIST has been set, skipping chrootmirror stage."
+ if [ "$KEEP_SRC_LIST" = "yes" ] ; then
+ echo "KEEP_SRC_LIST has been enabled, skipping chrootmirror stage."
return
fi
# remove local chroot mirror {{{
remove_chrootmirror() {
- if [ -n "$KEEP_SRC_LIST" ] ; then
- echo "KEEP_SRC_LIST has been set, skipping remove_chrootmirror stage."
+ if [ "$KEEP_SRC_LIST" = "yes" ] ; then
+ echo "KEEP_SRC_LIST has been enabled, skipping remove_chrootmirror stage."
return
fi
# helper function for fstab() {{{
createfstab(){
echo "Setting up /etc/fstab"
+ cat > /etc/fstab <<EOF
+# /etc/fstab - created by grml-debootstrap on $(date)
+# Accessible filesystems, by reference, are maintained under '/dev/disk/'.
+# See man pages fstab(5), findfs(8), mount(8) and/or blkid(8) for more info.
+#
+# After editing this file, run 'systemctl daemon-reload' to update systemd
+# units generated from this file.
+#
+EOF
+
if [ -n "$TARGET_UUID" ] ; then
- echo "/dev/disk/by-uuid/${TARGET_UUID} / auto defaults,errors=remount-ro 0 1" > /etc/fstab
+ local rootfs_mount_options=",errors=remount-ro"
+ case "${FILESYSTEM}" in
+ f2fs)
+ # errors=remount-ro is unsupported, see https://github.com/grml/grml-debootstrap/issues/163
+ rootfs_mount_options=""
+ ;;
+ esac
+
+ echo "/dev/disk/by-uuid/${TARGET_UUID} / auto defaults${rootfs_mount_options} 0 1" >> /etc/fstab
else
echo "Warning: couldn't identify target UUID for rootfs, your /etc/fstab might be incomplete."
fi
echo "Mounting $EFI on /boot/efi"
mount "$EFI" /boot/efi || return 1
+ # if efivarfs kernel module is loaded, but efivars isn't,
+ # then we need to mount efivarfs for efibootmgr usage
+ if ! ls /sys/firmware/efi/efivars/* &>/dev/null ; then
+ echo "Mounting efivarfs on /sys/firmware/efi/efivars"
+ mount -t efivarfs efivarfs /sys/firmware/efi/efivars
+ fi
+
echo "Invoking efibootmgr"
efibootmgr || return 1
}
return 1
fi
+ if [ -n "${BOOT_APPEND}" ] ; then
+ echo "Adding BOOT_APPEND configuration ['${BOOT_APPEND}'] to /etc/default/grub."
+ sed -i "/GRUB_CMDLINE_LINUX_DEFAULT/ s#\"\$# ${BOOT_APPEND}\"#" /etc/default/grub
+ fi
+
mountpoint /boot/efi &>/dev/null && umount /boot/efi
$UPDATEGRUB
[ -n "$POLICYRCD" ] && rm -f /usr/sbin/policy-rc.d
+ umount /sys/firmware/efi/efivars &>/dev/null || true
+
umount /sys >/dev/null 2>/dev/null || true
umount /proc >/dev/null 2>/dev/null || true
}