Unverified Commit 56926dda authored by Jörg Thalheim's avatar Jörg Thalheim Committed by GitHub
Browse files

Merge pull request #239393 from Lassulus/iso-graphical 

nixos/iso-image: make graphical grub configurable
parents cee7cb4c e4f361f3

nixos/modules/installer/cd-dvd/installation-cd-graphical-gnome.nix

+1 −0
Original line number Diff line number Diff line
@@ -6,6 +6,7 @@ 
  imports = [ ./installation-cd-graphical-base.nix ];



  isoImage.edition = "gnome";

  isoImage.graphicalGrub = true;



  services.xserver.desktopManager.gnome = {

    # Add Firefox and other tools useful for installation to the launcher

nixos/modules/installer/cd-dvd/iso-image.nix

+11 −1
Original line number Diff line number Diff line
@@ -283,7 +283,7 @@ let 
    cat <<EOF > $out/EFI/boot/grub.cfg



    set with_fonts=false

    set textmode=false

    set textmode=${boolToString !config.isoImage.graphicalGrub}

    # If you want to use serial for "terminal_*" commands, you need to set one up:

    #   Example manual configuration:

    #    → serial --unit=0 --speed=115200 --word=8 --parity=no --stop=1
@@ -658,6 +658,16 @@ in 
      '';

    };



    isoImage.graphicalGrub = mkOption {

      default = false;

      type = types.bool;

      example = true;

      description = lib.mdDoc ''

        Whether to use textmode or graphical grub.

        false means we use textmode grub.

      '';

    };



  };



  # store them in lib so we can mkImageMediaOverride the