diff options
author | worldofpeace <worldofpeace@protonmail.ch> | 2019-10-05 11:34:27 +0000 |
---|---|---|
committer | GitHub <noreply@github.com> | 2019-10-05 11:34:27 +0000 |
commit | 789fcebdaba6e5b51bdd021aac4ec1847214a714 (patch) | |
tree | 326bd97f79b0ede8c30e752df7ec9ea0b2fefb16 /nixos/modules/installer/cd-dvd | |
parent | 6fad65d5a08e47d08897e8dcadfc1f70b34702c9 (diff) | |
parent | 159b12bee7a9b30b0cfe25f53efcc443a130313d (diff) |
Merge pull request #46997 from worldofpeace/installer-autorun
installer: autorun xserver in graphical media
Diffstat (limited to 'nixos/modules/installer/cd-dvd')
-rw-r--r-- | nixos/modules/installer/cd-dvd/installation-cd-graphical-base.nix | 3 | ||||
-rw-r--r-- | nixos/modules/installer/cd-dvd/iso-image.nix | 8 |
2 files changed, 8 insertions, 3 deletions
diff --git a/nixos/modules/installer/cd-dvd/installation-cd-graphical-base.nix b/nixos/modules/installer/cd-dvd/installation-cd-graphical-base.nix index 1578e1547bc1..719ba5ffb127 100644 --- a/nixos/modules/installer/cd-dvd/installation-cd-graphical-base.nix +++ b/nixos/modules/installer/cd-dvd/installation-cd-graphical-base.nix @@ -25,9 +25,6 @@ with lib; services.xserver = { enable = true; - # Don't start the X server by default. - autorun = mkForce false; - # Automatically login as nixos. displayManager.slim = { enable = true; diff --git a/nixos/modules/installer/cd-dvd/iso-image.nix b/nixos/modules/installer/cd-dvd/iso-image.nix index 6595d0f30f9e..009f1e2c543a 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. |