Unverified Commit dc2fcd9f authored by github-actions[bot]'s avatar github-actions[bot] Committed by GitHub
Browse files

Merge master into staging-next

parents 9dd8bffe a98017a5

nixos/modules/system/activation/switch-to-configuration.pl

+14 −9
Original line number Diff line number Diff line
@@ -11,7 +11,6 @@ use Cwd 'abs_path'; 


my $out = "@out@";



# FIXME: maybe we should use /proc/1/exe to get the current systemd.

my $curSystemd = abs_path("/run/current-system/sw/bin");



# To be robust against interruption, record what units need to be started etc.
@@ -25,7 +24,7 @@ my $reloadByActivationFile = "/run/nixos/activation-reload-list"; 
my $dryRestartByActivationFile = "/run/nixos/dry-activation-restart-list";

my $dryReloadByActivationFile = "/run/nixos/dry-activation-reload-list";



make_path("/run/nixos", { mode => 0755 });

make_path("/run/nixos", { mode => oct(755) });



my $action = shift @ARGV;
@@ -219,13 +218,17 @@ while (my ($unit, $state) = each %{$activePrev}) { 
        }



        elsif (fingerprintUnit($prevUnitFile) ne fingerprintUnit($newUnitFile)) {

            if ($unit eq "sysinit.target" || $unit eq "basic.target" || $unit eq "multi-user.target" || $unit eq "graphical.target") {

            if ($unit eq "sysinit.target" || $unit eq "basic.target" || $unit eq "multi-user.target" || $unit eq "graphical.target" || $unit =~ /\.path$/ || $unit =~ /\.slice$/) {

                # Do nothing.  These cannot be restarted directly.



                # Slices and Paths don't have to be restarted since

                # properties (resource limits and inotify watches)

                # seem to get applied on daemon-reload.

            } elsif ($unit =~ /\.mount$/) {

                # Reload the changed mount unit to force a remount.

                $unitsToReload{$unit} = 1;

                recordUnit($reloadListFile, $unit);

            } elsif ($unit =~ /\.socket$/ || $unit =~ /\.path$/ || $unit =~ /\.slice$/) {

            } elsif ($unit =~ /\.socket$/) {

                # FIXME: do something?

            } else {

                my $unitInfo = parseUnit($newUnitFile);
@@ -382,12 +385,12 @@ if ($action eq "dry-activate") { 
        split('\n', read_file($dryReloadByActivationFile, err_mode => 'quiet') // "");



    print STDERR "would restart systemd\n" if $restartSystemd;

    print STDERR "would reload the following units: ", join(", ", sort(keys %unitsToReload)), "\n"

        if scalar(keys %unitsToReload) > 0;

    print STDERR "would restart the following units: ", join(", ", sort(keys %unitsToRestart)), "\n"

        if scalar(keys %unitsToRestart) > 0;

    print STDERR "would start the following units: ", join(", ", @unitsToStartFiltered), "\n"

        if scalar @unitsToStartFiltered;

    print STDERR "would reload the following units: ", join(", ", sort(keys %unitsToReload)), "\n"

        if scalar(keys %unitsToReload) > 0;

    unlink($dryRestartByActivationFile);

    unlink($dryReloadByActivationFile);

    exit 0;
@@ -400,7 +403,7 @@ if (scalar (keys %unitsToStop) > 0) { 
    print STDERR "stopping the following units: ", join(", ", @unitsToStopFiltered), "\n"

        if scalar @unitsToStopFiltered;

    # Use current version of systemctl binary before daemon is reexeced.

    system("$curSystemd/systemctl", "stop", "--", sort(keys %unitsToStop)); # FIXME: ignore errors?

    system("$curSystemd/systemctl", "stop", "--", sort(keys %unitsToStop));

}



print STDERR "NOT restarting the following changed units: ", join(", ", sort(keys %unitsToSkip)), "\n"
@@ -485,7 +488,7 @@ unlink($startListFile); 




# Print failed and new units.

my (@failed, @new, @restarting);

my (@failed, @new);

my $activeNew = getActiveUnits;

while (my ($unit, $state) = each %{$activeNew}) {

    if ($state->{state} eq "failed") {
@@ -501,7 +504,9 @@ while (my ($unit, $state) = each %{$activeNew}) { 
            push @failed, $unit;

        }

    }

    elsif ($state->{state} ne "failed" && !defined $activePrev->{$unit}) {

    # Ignore scopes since they are not managed by this script but rather

    # created and managed by third-party services via the systemd dbus API.

    elsif ($state->{state} ne "failed" && !defined $activePrev->{$unit} && $unit !~ /\.scope$/) {

        push @new, $unit;

    }

}

nixos/modules/system/activation/top-level.nix

+7 −0
Original line number Diff line number Diff line
@@ -78,6 +78,13 @@ let 
      export localeArchive="${config.i18n.glibcLocales}/lib/locale/locale-archive"

      substituteAll ${./switch-to-configuration.pl} $out/bin/switch-to-configuration

      chmod +x $out/bin/switch-to-configuration

      ${optionalString (pkgs.stdenv.hostPlatform == pkgs.stdenv.buildPlatform) ''

        if ! output=$($perl/bin/perl -c $out/bin/switch-to-configuration 2>&1); then

          echo "switch-to-configuration syntax is not valid:"

          echo "$output"

          exit 1

        fi

      ''}



      echo -n "${toString config.system.extraDependencies}" > $out/extra-dependencies

nixos/modules/system/boot/networkd.nix

+2 −0
Original line number Diff line number Diff line
@@ -572,6 +572,7 @@ let 
          "Family"

          "User"

          "SuppressPrefixLength"

          "Type"

        ])

        (assertInt "TypeOfService")

        (assertRange "TypeOfService" 0 255)
@@ -584,6 +585,7 @@ let 
        (assertValueOneOf "Family" ["ipv4" "ipv6" "both"])

        (assertInt "SuppressPrefixLength")

        (assertRange "SuppressPrefixLength" 0 128)

        (assertValueOneOf "Type" ["blackhole" "unreachable" "prohibit"])

      ];



      sectionRoute = checkUnitConfig "Route" [

pkgs/applications/networking/cluster/k9s/default.nix

+3 −3
Original line number Diff line number Diff line
@@ -2,13 +2,13 @@ 


buildGoModule rec {

  pname = "k9s";

  version = "0.25.7";

  version = "0.25.8";



  src = fetchFromGitHub {

    owner  = "derailed";

    repo   = "k9s";

    rev    = "v${version}";

    sha256 = "sha256-CFXPo8dpefrrBxCGpcGtZfLdfMYCBL/eQhHqZggK/yA=";

    sha256 = "sha256-ZHIFMNY6eW3t604Kd6Cb9Ex9DbsG31ShD4ITKnDAUbs=";

  };



  ldflags = [
@@ -17,7 +17,7 @@ buildGoModule rec { 
    "-X github.com/derailed/k9s/cmd.commit=${src.rev}"

  ];



  vendorSha256 = "sha256-v4cd+f2GSE2ad0wWrW9x6/U6RREhFV83wVNFUMfWaA4=";

  vendorSha256 = "sha256-jWZ1N1A8VECBQvkXyuzMUkI4u2NLr5/gSvJUfK5VgzM=";



  preCheck = "export HOME=$(mktemp -d)";

pkgs/applications/networking/cluster/kubeseal/default.nix

+2 −2
Original line number Diff line number Diff line
@@ -2,13 +2,13 @@ 


buildGoModule rec {

  pname = "kubeseal";

  version = "0.16.0";

  version = "0.17.0";



  src = fetchFromGitHub {

    owner = "bitnami-labs";

    repo = "sealed-secrets";

    rev = "v${version}";

    sha256 = "sha256-+9yOBrq34VCy1yAkSh1iHbgtckuz2FcHokH/Cb/Heus=";

    sha256 = "sha256-7u7lsMeeZOUGn8eb8sjV9Td+XNEUPDvbSaITdp1JTf4=";

  };



  vendorSha256 = null;