Slight installer improvements

This commit is contained in:
Jack O'Sullivan 2022-06-30 00:49:23 +01:00
parent 17d2b9e158
commit 8ec6804f80
2 changed files with 8 additions and 1 deletions

View File

@ -126,6 +126,8 @@ in
help = "Install a system configuration into a prepared installer that can be reached at $INSTALLER"; help = "Install a system configuration into a prepared installer that can be reached at $INSTALLER";
script = script =
'' ''
usage="usage: $0 [--no-bootloader] [--no-substitute] <system>"
noBootloader= noBootloader=
noSubstitute= noSubstitute=
${parseArgs ${parseArgs
@ -138,9 +140,13 @@ in
noSubstitute=true noSubstitute=true
shift shift
;; ;;
--help)
log "$usage"
exit 0
;;
''} ''}
system="''${1:-}" system="''${1:-}"
[ -z "$system" ] && die "usage: $0 [--no-bootloader] [--no-substitute] <system>" [ -z "$system" ] && die "$usage"
: "''${INSTALLER_BUILD_OPTS:=}" : "''${INSTALLER_BUILD_OPTS:=}"
IFS=" " read -ra BUILD_OPTS <<< "$INSTALLER_BUILD_OPTS" IFS=" " read -ra BUILD_OPTS <<< "$INSTALLER_BUILD_OPTS"

View File

@ -93,6 +93,7 @@ in
loader = { loader = {
efi = { efi = {
efiSysMountPoint = mkDefault "/boot"; efiSysMountPoint = mkDefault "/boot";
# Should generally be enough with just /EFI/BOOT/BOOTX64.EFI in place
canTouchEfiVariables = mkDefault false; canTouchEfiVariables = mkDefault false;
}; };
grub = { grub = {