movefasta/nixpkgs
1
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2025-06-11 12:15:34 +03:00
Code Issues Projects Releases Packages Wiki Activity

nixos-generate-config: Fix unspecified root

Browse source
This commit is contained in:
Will Fancher 2025-03-18 04:54:39 -04:00
parent a2636dae46
commit b82dbaf3ab
1 changed files with 7 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

10
nixos/modules/installer/tools/nixos-generate-config.pl
View file

@ -43,7 +43,11 @@ my $kernel = "lts";
if (-e "/etc/nixos-generate-config.conf") {
my $cfg = new Config::IniFiles -file => "/etc/nixos-generate-config.conf";
$outDir = $cfg->val("Defaults", "Directory") // $outDir;
$rootDir = $cfg->val("Defaults", "RootDirectory") // $rootDir;
if (defined $cfg->val("Defaults", "RootDirectory")) {
$rootDir = $cfg->val("Defaults", "RootDirectory");
$rootDir =~ s/\/*$//; # remove trailing slashes
$rootDir = File::Spec->rel2abs($rootDir); # resolve absolute path
}
$kernel = $cfg->val("Defaults", "Kernel") // $kernel;
}
@ -62,6 +66,8 @@ for (my $n = 0; $n < scalar @ARGV; $n++) {
$rootDir = $ARGV[$n];
die "$0: ‘--root’ requires an argument\n" unless defined $rootDir;
die "$0: no need to specify `/` with `--root`, it is the default\n" if $rootDir eq "/";
$rootDir =~ s/\/*$//; # remove trailing slashes
$rootDir = File::Spec->rel2abs($rootDir); # resolve absolute path
}
elsif ($arg eq "--force") {
$force = 1;
@ -85,8 +91,6 @@ for (my $n = 0; $n < scalar @ARGV; $n++) {
}
}
$rootDir =~ s/\/*$//; # remove trailing slashes
$rootDir = File::Spec->rel2abs($rootDir); # resolve absolute path
die "$0: invalid kernel: '$kernel'" unless $kernel eq "lts" || $kernel eq "latest";
my @attrs = ();