diff --git a/nixos/modules/services/hardware/udev.nix b/nixos/modules/services/hardware/udev.nix
index 5fdf97fbdf83..8257eeb673b9 100644
--- a/nixos/modules/services/hardware/udev.nix
+++ b/nixos/modules/services/hardware/udev.nix
@@ -29,10 +29,10 @@ let
'';
# Perform substitutions in all udev rules files.
- udevRules = pkgs.runCommand "udev-rules"
+ udevRulesFor = { name, udevPackages, udevPath, udev, systemd, binPackages, initrdBin ? null }: pkgs.runCommand name
{ preferLocalBuild = true;
allowSubstitutes = false;
- packages = unique (map toString cfg.packages);
+ packages = unique (map toString udevPackages);
}
''
mkdir -p $out
@@ -60,6 +60,9 @@ let
--replace \"/bin/mount \"${pkgs.util-linux}/bin/mount \
--replace /usr/bin/readlink ${pkgs.coreutils}/bin/readlink \
--replace /usr/bin/basename ${pkgs.coreutils}/bin/basename
+ ${optionalString (initrdBin != null) ''
+ substituteInPlace $i --replace '/run/current-system/systemd' "${removeSuffix "/bin" initrdBin}"
+ ''}
done
echo -n "Checking that all programs called by relative paths in udev rules exist in ${udev}/lib/udev... "
@@ -84,8 +87,9 @@ let
for i in $import_progs $run_progs; do
# if the path refers to /run/current-system/systemd, replace with config.systemd.package
if [[ $i == /run/current-system/systemd* ]]; then
- i="${config.systemd.package}/''${i#/run/current-system/systemd/}"
+ i="${systemd}/''${i#/run/current-system/systemd/}"
fi
+
if [[ ! -x $i ]]; then
echo "FAIL"
echo "$i is called in udev rules but is not executable or does not exist"
@@ -102,7 +106,7 @@ let
echo "Consider fixing the following udev rules:"
echo "$filesToFixup" | while read localFile; do
remoteFile="origin unknown"
- for i in ${toString cfg.packages}; do
+ for i in ${toString binPackages}; do
for j in "$i"/*/udev/rules.d/*; do
[ -e "$out/$(basename "$j")" ] || continue
[ "$(basename "$j")" = "$(basename "$localFile")" ] || continue
@@ -125,7 +129,7 @@ let
${optionalString (!config.boot.hardwareScan) ''
ln -s /dev/null $out/80-drivers.rules
''}
- ''; # */
+ '';
hwdbBin = pkgs.runCommand "hwdb.bin"
{ preferLocalBuild = true;
@@ -201,20 +205,6 @@ in
'';
};
- initrdRules = mkOption {
- default = "";
- example = ''
- SUBSYSTEM=="net", ACTION=="add", DRIVERS=="?*", ATTR{address}=="00:1D:60:B9:6D:4F", KERNEL=="eth*", NAME="my_fast_network_card"
- '';
- type = types.lines;
- description = ''
- udev rules to include in the initrd
- only. They'll be written into file
- 99-local.rules. Thus they are read and applied
- after the essential initrd rules.
- '';
- };
-
extraRules = mkOption {
default = "";
example = ''
@@ -282,6 +272,52 @@ in
'';
};
+ boot.initrd.services.udev = {
+
+ packages = mkOption {
+ type = types.listOf types.path;
+ default = [];
+ visible = false;
+ description = ''
+ This will only be used when systemd is used in stage 1.
+
+ List of packages containing udev rules that will be copied to stage 1.
+ All files found in
+ pkg/etc/udev/rules.d and
+ pkg/lib/udev/rules.d
+ will be included.
+ '';
+ };
+
+ binPackages = mkOption {
+ type = types.listOf types.path;
+ default = [];
+ visible = false;
+ description = ''
+ This will only be used when systemd is used in stage 1.
+
+ Packages to search for binaries that are referenced by the udev rules in stage 1.
+ This list always contains /bin of the initrd.
+ '';
+ apply = map getBin;
+ };
+
+ rules = mkOption {
+ default = "";
+ example = ''
+ SUBSYSTEM=="net", ACTION=="add", DRIVERS=="?*", ATTR{address}=="00:1D:60:B9:6D:4F", KERNEL=="eth*", NAME="my_fast_network_card"
+ '';
+ type = types.lines;
+ description = ''
+ udev rules to include in the initrd
+ only. They'll be written into file
+ 99-local.rules. Thus they are read and applied
+ after the essential initrd rules.
+ '';
+ };
+
+ };
+
};
@@ -297,16 +333,54 @@ in
boot.kernelParams = mkIf (!config.networking.usePredictableInterfaceNames) [ "net.ifnames=0" ];
- boot.initrd.extraUdevRulesCommands = optionalString (cfg.initrdRules != "")
+ boot.initrd.extraUdevRulesCommands = optionalString (!config.boot.initrd.systemd.enable && config.boot.initrd.services.udev.rules != "")
''
cat <<'EOF' > $out/99-local.rules
- ${cfg.initrdRules}
+ ${config.boot.initrd.services.udev.rules}
EOF
'';
+ boot.initrd.systemd.additionalUpstreamUnits = [
+ # TODO: "initrd-udevadm-cleanup-db.service" is commented out because of https://github.com/systemd/systemd/issues/12953
+ "systemd-udevd-control.socket"
+ "systemd-udevd-kernel.socket"
+ "systemd-udevd.service"
+ "systemd-udev-settle.service"
+ "systemd-udev-trigger.service"
+ ];
+ boot.initrd.systemd.storePaths = [
+ "${config.boot.initrd.systemd.package}/lib/systemd/systemd-udevd"
+ "${config.boot.initrd.systemd.package}/lib/udev"
+ ] ++ map (x: "${x}/bin") config.boot.initrd.services.udev.binPackages;
+
+ # Generate the udev rules for the initrd
+ boot.initrd.systemd.contents = {
+ "/etc/udev/rules.d".source = udevRulesFor {
+ name = "initrd-udev-rules";
+ initrdBin = config.boot.initrd.systemd.contents."/bin".source;
+ udevPackages = config.boot.initrd.services.udev.packages;
+ udevPath = config.boot.initrd.systemd.contents."/bin".source;
+ udev = config.boot.initrd.systemd.package;
+ systemd = config.boot.initrd.systemd.package;
+ binPackages = config.boot.initrd.services.udev.binPackages ++ [ config.boot.initrd.systemd.contents."/bin".source ];
+ };
+ };
+ # Insert custom rules
+ boot.initrd.services.udev.packages = mkIf (config.boot.initrd.services.udev.rules != "") (pkgs.writeTextFile {
+ name = "initrd-udev-rules";
+ destination = "/etc/udev/rules.d/99-local.rules";
+ text = config.boot.initrd.services.udev.rules;
+ });
+
environment.etc =
{
- "udev/rules.d".source = udevRules;
+ "udev/rules.d".source = udevRulesFor {
+ name = "udev-rules";
+ udevPackages = cfg.packages;
+ systemd = config.systemd.package;
+ binPackages = cfg.packages;
+ inherit udevPath udev;
+ };
"udev/hwdb.bin".source = hwdbBin;
};
@@ -337,4 +411,8 @@ in
};
};
+
+ imports = [
+ (mkRenamedOptionModule [ "services" "udev" "initrdRules" ] [ "boot" "initrd" "services" "udev" "rules" ])
+ ];
}
diff --git a/nixos/modules/system/boot/systemd/initrd.nix b/nixos/modules/system/boot/systemd/initrd.nix
index dab06a7b98e7..3af124d06a9d 100644
--- a/nixos/modules/system/boot/systemd/initrd.nix
+++ b/nixos/modules/system/boot/systemd/initrd.nix
@@ -34,7 +34,6 @@ let
"initrd-switch-root.service"
"initrd-switch-root.target"
"initrd.target"
- "initrd-udevadm-cleanup-db.service"
"kexec.target"
"kmod-static-nodes.service"
"local-fs-pre.target"
@@ -71,12 +70,6 @@ let
"systemd-sysctl.service"
"systemd-tmpfiles-setup-dev.service"
"systemd-tmpfiles-setup.service"
- "systemd-udevd-control.socket"
- "systemd-udevd-kernel.socket"
- "systemd-udevd.service"
- "systemd-udev-settle.service"
- "systemd-udev-trigger.service"
- "systemd-vconsole-setup.service"
"timers.target"
"umount.target"
@@ -385,6 +378,11 @@ in {
"/etc/sysctl.d/nixos.conf".text = "kernel.modprobe = /sbin/modprobe";
"/etc/modprobe.d/systemd.conf".source = "${cfg.package}/lib/modprobe.d/systemd.conf";
+ "/etc/modprobe.d/ubuntu.conf".source = pkgs.runCommand "initrd-kmod-blacklist-ubuntu" { } ''
+ ${pkgs.buildPackages.perl}/bin/perl -0pe 's/## file: iwlwifi.conf(.+?)##/##/s;' $src > $out
+ '';
+ "/etc/modprobe.d/debian.conf".source = pkgs.kmod-debian-aliases;
+
};
storePaths = [
@@ -400,12 +398,10 @@ in {
"${cfg.package}/lib/systemd/systemd-shutdown"
"${cfg.package}/lib/systemd/systemd-sulogin-shell"
"${cfg.package}/lib/systemd/systemd-sysctl"
- "${cfg.package}/lib/systemd/systemd-udevd"
"${cfg.package}/lib/systemd/systemd-vconsole-setup"
# additional systemd directories
"${cfg.package}/lib/systemd/system-generators"
- "${cfg.package}/lib/udev"
# utilities needed by systemd
"${cfg.package.util-linux}/bin/mount"
diff --git a/nixos/tests/networking.nix b/nixos/tests/networking.nix
index bd517093eb3d..a1150097a091 100644
--- a/nixos/tests/networking.nix
+++ b/nixos/tests/networking.nix
@@ -878,7 +878,7 @@ let
linkConfig.Name = "custom_name";
};
}
- else { services.udev.initrdRules = ''
+ else { boot.initrd.services.udev.rules = ''
SUBSYSTEM=="net", ACTION=="add", DRIVERS=="?*", ATTR{address}=="52:54:00:12:01:01", KERNEL=="eth*", NAME="custom_name"
'';
});