alioth/nixpkgs
3
0
Fork 0
forked from mirrors/nixpkgs
Code Releases Activity

nixos/installer: mkForce -> mkImageMediaOverride

Browse source 
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
This commit is contained in:
Andrew Marshall 2022-08-14 12:13:04 -04:00
parent 452ed1591c
commit 37da853f49
2 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
nixos/modules/installer/cd-dvd/installation-cd-graphical-base.nix
View file

@ -26,7 +26,7 @@ with lib;
# Provide networkmanager for easy wireless configuration. # Provide networkmanager for easy wireless configuration.
networking.networkmanager.enable = true; 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 # KDE complains if power management is disabled (to be precise, if
# there is no power management backend such as upower). # there is no power management backend such as upower).

6
nixos/modules/profiles/installation-device.nix
View file

@ -22,10 +22,10 @@ with lib;
config = { config = {
# Enable in installer, even if the minimal profile disables it. # Enable in installer, even if the minimal profile disables it.
documentation.enable = mkForce true; documentation.enable = mkImageMediaOverride true;
# Show the manual. # Show the manual.
documentation.nixos.enable = mkForce true; documentation.nixos.enable = mkImageMediaOverride true;
# Use less privileged nixos user # Use less privileged nixos user
users.users.nixos = { users.users.nixos = {
@ -41,7 +41,7 @@ with lib;
# Allow passwordless sudo from nixos user # Allow passwordless sudo from nixos user
security.sudo = { security.sudo = {
enable = mkDefault true; enable = mkDefault true;
wheelNeedsPassword = mkForce false; wheelNeedsPassword = mkImageMediaOverride false;
}; };
# Automatically log in at the virtual consoles. # Automatically log in at the virtual consoles.