From 37da853f496341eee70170e93095d82bcf60a79a Mon Sep 17 00:00:00 2001 From: Andrew Marshall Date: Sun, 14 Aug 2022 12:13:04 -0400 Subject: [PATCH] nixos/installer: mkForce -> mkImageMediaOverride This is image media, so use the override level designed for it. As detailed in the definition for mkImageMediaOverride: > image media profiles can be derived by inclusion into host config, > hence needing to override host config, but do allow user to mkForce --- .../installer/cd-dvd/installation-cd-graphical-base.nix | 2 +- 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.