Unverified Commit f485e839 authored by Tristan Ross's avatar Tristan Ross Committed by GitHub
Browse files

nixos-generate-config: Add a flake default to the conf file (#410332)

parents 71c09d9c d5960b9e

nixos/modules/installer/tools/nixos-generate-config.pl

+1 −0
Original line number Diff line number Diff line
@@ -49,6 +49,7 @@ if (-e "/etc/nixos-generate-config.conf") { 
        $rootDir = File::Spec->rel2abs($rootDir); # resolve absolute path

    }

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

    $flake = $cfg->val("Defaults", "Flake") // $flake;

}



for (my $n = 0; $n < scalar @ARGV; $n++) {

nixos/tests/nixos-generate-config.nix

+6 −0
Original line number Diff line number Diff line
@@ -46,5 +46,11 @@ 
    machine.succeed("rm -rf /etc/nixos")

    machine.succeed("nixos-generate-config --flake")

    machine.succeed("nix-instantiate --parse /etc/nixos/flake.nix /etc/nixos/configuration.nix /etc/nixos/hardware-configuration.nix")



    machine.succeed("mv /etc/nixos /etc/nixos-with-flake-arg")

    machine.succeed("printf '[Defaults]\nFlake = 1\n' > /etc/nixos-generate-config.conf")

    machine.succeed("nixos-generate-config")

    machine.succeed("nix-instantiate --parse /etc/nixos/flake.nix /etc/nixos/configuration.nix /etc/nixos/hardware-configuration.nix")

    machine.succeed("diff -r /etc/nixos /etc/nixos-with-flake-arg")

  '';

}