commit b82dbaf3abfe30ba7625b0094c7ccf12ca6a02fc · pyrox.dev/nixpkgs

+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
       46
       -
           $rootDir = $cfg->val("Defaults", "RootDirectory") // $rootDir;

     

       46
       46
       +
           if (defined $cfg->val("Defaults", "RootDirectory")) {

     

       47
       47
       +
               $rootDir = $cfg->val("Defaults", "RootDirectory");

     

       48
       48
       +
               $rootDir =~ s/\/*$//; # remove trailing slashes

     

       49
       49
       +
               $rootDir = File::Spec->rel2abs($rootDir); # resolve absolute path

     

       50
       50
       +
           }

     

       47
       51
        
           $kernel = $cfg->val("Defaults", "Kernel") // $kernel;

     

       48
       52
        
       }

     

       49
       53
        
       

     
···

       62
       66
        
               $rootDir = $ARGV[$n];

     

       63
       67
        
               die "$0: ‘--root’ requires an argument\n" unless defined $rootDir;

     

       64
       68
        
               die "$0: no need to specify `/` with `--root`, it is the default\n" if $rootDir eq "/";

     

       69
       69
       +
               $rootDir =~ s/\/*$//; # remove trailing slashes

     

       70
       70
       +
               $rootDir = File::Spec->rel2abs($rootDir); # resolve absolute path

     

       65
       71
        
           }

     

       66
       72
        
           elsif ($arg eq "--force") {

     

       67
       73
        
               $force = 1;

     
···

       85
       91
        
           }

     

       86
       92
        
       }

     

       87
       93
        
       

     

       88
       88
       -
       $rootDir =~ s/\/*$//; # remove trailing slashes

     

       89
       89
       -
       $rootDir = File::Spec->rel2abs($rootDir); # resolve absolute path

     

       90
       94
        
       die "$0: invalid kernel: '$kernel'" unless $kernel eq "lts" || $kernel eq "latest";

     

       91
       95
        
       

     

       92
       96
        
       my @attrs = ();