gador/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

nixos/activation: allowed quoted values in /etc/os-release

Browse Source
This commit is contained in:
Peter Hoeg
2022-03-08 21:17:07 +08:00
parent 0e17a0fea6
commit d44916d12f
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
nixos/modules/system/activation/switch-to-configuration.pl
View File

@@ -59,7 +59,7 @@ $ENV{NIXOS_ACTION} = $action;
# This is a NixOS installation if it has /etc/NIXOS or a proper # This is a NixOS installation if it has /etc/NIXOS or a proper
# /etc/os-release. # /etc/os-release.
die "This is not a NixOS installation!\n" unless die "This is not a NixOS installation!\n" unless
-f "/etc/NIXOS" || (read_file("/etc/os-release", err_mode => 'quiet') // "") =~ /ID=nixos/s; -f "/etc/NIXOS" || (read_file("/etc/os-release", err_mode => 'quiet') // "") =~ /ID="?nixos"?/s;
openlog("nixos", "", LOG_USER); openlog("nixos", "", LOG_USER);