diff options
| author | Christian Kögler <ck3d@gmx.de> | 2022-09-09 17:32:17 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-09-09 17:32:17 +0200 |
| commit | b3c8810040dee292fa7f2693358a46945221407a (patch) | |
| tree | 3893a8fe156a5906c71ca3774804b30c973cafda /nixos | |
| parent | daaee5e31b66bf618cec117cfde7d7428c28ae2b (diff) | |
| parent | 37da853f496341eee70170e93095d82bcf60a79a (diff) | |
| download | nixlib-b3c8810040dee292fa7f2693358a46945221407a.tar nixlib-b3c8810040dee292fa7f2693358a46945221407a.tar.gz nixlib-b3c8810040dee292fa7f2693358a46945221407a.tar.bz2 nixlib-b3c8810040dee292fa7f2693358a46945221407a.tar.lz nixlib-b3c8810040dee292fa7f2693358a46945221407a.tar.xz nixlib-b3c8810040dee292fa7f2693358a46945221407a.tar.zst nixlib-b3c8810040dee292fa7f2693358a46945221407a.zip | |
Merge pull request #186695 from amarshall/installer-no-mkforce
nixos/installer: mkForce -> mkImageMediaOverride
Diffstat (limited to 'nixos')
| -rw-r--r-- | nixos/modules/installer/cd-dvd/installation-cd-graphical-base.nix | 2 | ||||
| -rw-r--r-- | nixos/modules/profiles/installation-device.nix | 6 |
2 files changed, 4 insertions, 4 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 8c7bac6f6cc1..c5976166fb31 100644 --- a/nixos/modules/installer/cd-dvd/installation-cd-graphical-base.nix +++ b/nixos/modules/installer/cd-dvd/installation-cd-graphical-base.nix @@ -26,7 +26,7 @@ with lib; # Provide networkmanager for easy wireless configuration. networking.networkmanager.enable = true; - networking.wireless.enable = mkForce false; + networking.wireless.enable = mkImageMediaOverride false; # KDE complains if power management is disabled (to be precise, if # there is no power management backend such as upower). diff --git a/nixos/modules/profiles/installation-device.nix b/nixos/modules/profiles/installation-device.nix index a8601a9e2c06..ae9be08c8d85 100644 --- a/nixos/modules/profiles/installation-device.nix +++ b/nixos/modules/profiles/installation-device.nix @@ -22,10 +22,10 @@ with lib; config = { # Enable in installer, even if the minimal profile disables it. - documentation.enable = mkForce true; + documentation.enable = mkImageMediaOverride true; # Show the manual. - documentation.nixos.enable = mkForce true; + documentation.nixos.enable = mkImageMediaOverride true; # Use less privileged nixos user users.users.nixos = { @@ -41,7 +41,7 @@ with lib; # Allow passwordless sudo from nixos user security.sudo = { enable = mkDefault true; - wheelNeedsPassword = mkForce false; + wheelNeedsPassword = mkImageMediaOverride false; }; # Automatically log in at the virtual consoles. |