nixpkgs mirror (for testing) github.com/NixOS/nixpkgs
nix

nixos-generate-config: Fix unspecified root

+7 -3
+7 -3
nixos/modules/installer/tools/nixos-generate-config.pl
··· 43 43 if (-e "/etc/nixos-generate-config.conf") { 44 44 my $cfg = new Config::IniFiles -file => "/etc/nixos-generate-config.conf"; 45 45 $outDir = $cfg->val("Defaults", "Directory") // $outDir; 46 - $rootDir = $cfg->val("Defaults", "RootDirectory") // $rootDir; 46 + if (defined $cfg->val("Defaults", "RootDirectory")) { 47 + $rootDir = $cfg->val("Defaults", "RootDirectory"); 48 + $rootDir =~ s/\/*$//; # remove trailing slashes 49 + $rootDir = File::Spec->rel2abs($rootDir); # resolve absolute path 50 + } 47 51 $kernel = $cfg->val("Defaults", "Kernel") // $kernel; 48 52 } 49 53 ··· 66 62 $rootDir = $ARGV[$n]; 67 63 die "$0: ‘--root’ requires an argument\n" unless defined $rootDir; 68 64 die "$0: no need to specify `/` with `--root`, it is the default\n" if $rootDir eq "/"; 65 + $rootDir =~ s/\/*$//; # remove trailing slashes 66 + $rootDir = File::Spec->rel2abs($rootDir); # resolve absolute path 69 67 } 70 68 elsif ($arg eq "--force") { 71 69 $force = 1; ··· 91 85 } 92 86 } 93 87 94 - $rootDir =~ s/\/*$//; # remove trailing slashes 95 - $rootDir = File::Spec->rel2abs($rootDir); # resolve absolute path 96 88 die "$0: invalid kernel: '$kernel'" unless $kernel eq "lts" || $kernel eq "latest"; 97 89 98 90 my @attrs = ();