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

Merge master into staging-next

parents 7c78a608 b5cd423a

maintainers/maintainer-list.nix

+7 −0
Original line number Diff line number Diff line
@@ -8401,6 +8401,13 @@ 
    githubId = 33969028;

    name = "Sebastian Hasler";

  };

  hasnep = {

    name = "Hannes";

    email = "h@nnes.dev";

    matrix = "@hasnep:matrix.org";

    github = "Hasnep";

    githubId = 25184102;

  };

  hausken = {

    name = "Hausken";

    email = "hauskens-git@disp.lease>";

nixos/modules/config/resolvconf.nix

+14 −2
Original line number Diff line number Diff line
@@ -114,6 +114,15 @@ in 
        '';

      };



      subscriberFiles = lib.mkOption {

        type = lib.types.listOf lib.types.path;

        default = [];

        description = ''

          Files written by resolvconf updates

        '';

        internal = true;

      };



    };



  };
@@ -134,6 +143,8 @@ in 
    (lib.mkIf cfg.enable {

      users.groups.resolvconf = {};



      networking.resolvconf.subscriberFiles = [ "/etc/resolv.conf" ];



      networking.resolvconf.package = pkgs.openresolv;



      environment.systemPackages = [ cfg.package ];
@@ -150,8 +161,9 @@ in 


        script = ''

          ${lib.getExe cfg.package} -u

          chgrp -R resolvconf /etc/resolv.conf /run/resolvconf

          chmod -R g=u /etc/resolv.conf /run/resolvconf

          files=(/run/resolvconf ${lib.escapeShellArgs cfg.subscriberFiles})

          chgrp -R resolvconf "''${files[@]}"

          chmod -R g=u "''${files[@]}"

        '';

      };

nixos/modules/services/networking/dhcpcd.nix

+1 −1
Original line number Diff line number Diff line
@@ -250,7 +250,7 @@ in 
            Restart = "always";

            AmbientCapabilities = [ "CAP_NET_ADMIN" "CAP_NET_RAW" "CAP_NET_BIND_SERVICE" ];

            ReadWritePaths = [ "/proc/sys/net/ipv6" ]

              ++ lib.optionals useResolvConf [ "/etc/resolv.conf" "/run/resolvconf" ];

              ++ lib.optionals useResolvConf ([ "/run/resolvconf" ] ++ config.networking.resolvconf.subscriberFiles);

            DeviceAllow = "";

            LockPersonality = true;

            MemoryDenyWriteExecute = true;

nixos/modules/services/networking/dnsmasq.nix

+5 −0
Original line number Diff line number Diff line
@@ -133,6 +133,11 @@ in 
        dnsmasq_conf=/etc/dnsmasq-conf.conf

        dnsmasq_resolv=/etc/dnsmasq-resolv.conf

      '';



      subscriberFiles = [

        "/etc/dnsmasq-conf.conf"

        "/etc/dnsmasq-resolv.conf"

      ];

    };



    systemd.services.dnsmasq = {

nixos/modules/system/boot/stage-1.nix

+1 −7
Original line number Diff line number Diff line
@@ -349,13 +349,7 @@ let 
        { object = "${modulesClosure}/lib";

          symlink = "/lib";

        }

        { object = pkgs.runCommand "initrd-kmod-blacklist-ubuntu" {

              src = "${pkgs.kmod-blacklist-ubuntu}/modprobe.conf";

              preferLocalBuild = true;

            } ''

              target=$out

              ${pkgs.buildPackages.perl}/bin/perl -0pe 's/## file: iwlwifi.conf(.+?)##/##/s;' $src > $out

            '';

        { object = "${pkgs.kmod-blacklist-ubuntu}/modprobe.conf";

          symlink = "/etc/modprobe.d/ubuntu.conf";

        }

        { object = config.environment.etc."modprobe.d/nixos.conf".source;