summary refs log tree commit diff
path: root/nixos/modules/installer/cd-dvd/iso-image.nix
diff options
context:
space:
mode:
authorworldofpeace <worldofpeace@protonmail.ch>2019-10-05 11:34:27 +0000
committerGitHub <noreply@github.com>2019-10-05 11:34:27 +0000
commit789fcebdaba6e5b51bdd021aac4ec1847214a714 (patch)
tree326bd97f79b0ede8c30e752df7ec9ea0b2fefb16 /nixos/modules/installer/cd-dvd/iso-image.nix
parent6fad65d5a08e47d08897e8dcadfc1f70b34702c9 (diff)
parent159b12bee7a9b30b0cfe25f53efcc443a130313d (diff)
downloadnixpkgs-789fcebdaba6e5b51bdd021aac4ec1847214a714.tar
nixpkgs-789fcebdaba6e5b51bdd021aac4ec1847214a714.tar.gz
nixpkgs-789fcebdaba6e5b51bdd021aac4ec1847214a714.tar.bz2
nixpkgs-789fcebdaba6e5b51bdd021aac4ec1847214a714.tar.lz
nixpkgs-789fcebdaba6e5b51bdd021aac4ec1847214a714.tar.xz
nixpkgs-789fcebdaba6e5b51bdd021aac4ec1847214a714.tar.zst
nixpkgs-789fcebdaba6e5b51bdd021aac4ec1847214a714.zip
Merge pull request #46997 from worldofpeace/installer-autorun
installer: autorun xserver in graphical media
Diffstat (limited to 'nixos/modules/installer/cd-dvd/iso-image.nix')
-rw-r--r--nixos/modules/installer/cd-dvd/iso-image.nix8
1 files changed, 8 insertions, 0 deletions
diff --git a/nixos/modules/installer/cd-dvd/iso-image.nix b/nixos/modules/installer/cd-dvd/iso-image.nix
index 6595d0f30f9..009f1e2c543 100644
--- a/nixos/modules/installer/cd-dvd/iso-image.nix
+++ b/nixos/modules/installer/cd-dvd/iso-image.nix
@@ -290,6 +290,14 @@ let
         ${buildMenuAdditionalParamsGrub2 config "video=1920x1080@60"}
       }
 
+      # If we boot into a graphical environment where X is autoran
+      # and always crashes, it makes the media unusable. Allow the user
+      # to disable this.
+      submenu "Disable display-manager" --class quirk-disable-displaymanager {
+        ${grubMenuCfg}
+        ${buildMenuAdditionalParamsGrub2 config "systemd.mask=display-manager.service"}
+      }
+
       # Some laptop and convertibles have the panel installed in an
       # inconvenient way, rotated away from the keyboard.
       # Those entries makes it easier to use the installer.