diff options
| author | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2014-04-20 19:31:01 +0200 |
|---|---|---|
| committer | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2014-04-20 19:31:01 +0200 |
| commit | 4e8c2f0ff91c19065f44fd66c9d869b920631557 (patch) | |
| tree | fcdb6062bbcb33f4ed4013ed9b4a0020e166d948 /nixos/modules/services/hardware | |
| parent | cb83796abb3870cf6dc74c4823067bc7b43a9395 (diff) | |
| parent | a0c0dfb6471506a1c4b98c8b6ec7a31271025573 (diff) | |
| download | nixlib-4e8c2f0ff91c19065f44fd66c9d869b920631557.tar nixlib-4e8c2f0ff91c19065f44fd66c9d869b920631557.tar.gz nixlib-4e8c2f0ff91c19065f44fd66c9d869b920631557.tar.bz2 nixlib-4e8c2f0ff91c19065f44fd66c9d869b920631557.tar.lz nixlib-4e8c2f0ff91c19065f44fd66c9d869b920631557.tar.xz nixlib-4e8c2f0ff91c19065f44fd66c9d869b920631557.tar.zst nixlib-4e8c2f0ff91c19065f44fd66c9d869b920631557.zip | |
Merge branch 'systemd-update'
Diffstat (limited to 'nixos/modules/services/hardware')
| -rw-r--r-- | nixos/modules/services/hardware/80-net-name-slot.rules | 13 | ||||
| -rw-r--r-- | nixos/modules/services/hardware/udev.nix | 8 | ||||
| -rw-r--r-- | nixos/modules/services/hardware/udisks2.nix | 2 |
3 files changed, 20 insertions, 3 deletions
diff --git a/nixos/modules/services/hardware/80-net-name-slot.rules b/nixos/modules/services/hardware/80-net-name-slot.rules new file mode 100644 index 000000000000..18547f170a3f --- /dev/null +++ b/nixos/modules/services/hardware/80-net-name-slot.rules @@ -0,0 +1,13 @@ +# Copied from systemd 203. +ACTION=="remove", GOTO="net_name_slot_end" +SUBSYSTEM!="net", GOTO="net_name_slot_end" +NAME!="", GOTO="net_name_slot_end" + +IMPORT{cmdline}="net.ifnames" +ENV{net.ifnames}=="0", GOTO="net_name_slot_end" + +NAME=="", ENV{ID_NET_NAME_ONBOARD}!="", NAME="$env{ID_NET_NAME_ONBOARD}" +NAME=="", ENV{ID_NET_NAME_SLOT}!="", NAME="$env{ID_NET_NAME_SLOT}" +NAME=="", ENV{ID_NET_NAME_PATH}!="", NAME="$env{ID_NET_NAME_PATH}" + +LABEL="net_name_slot_end" diff --git a/nixos/modules/services/hardware/udev.nix b/nixos/modules/services/hardware/udev.nix index d218aa1e5e16..507752dabcf7 100644 --- a/nixos/modules/services/hardware/udev.nix +++ b/nixos/modules/services/hardware/udev.nix @@ -83,8 +83,8 @@ let grep -l '\(RUN+\|IMPORT{program}\)="\(/usr\)\?/s\?bin' $i/*/udev/rules.d/* || true done - ${optionalString (!config.networking.usePredictableInterfaceNames) '' - ln -s /dev/null $out/80-net-name-slot.rules + ${optionalString config.networking.usePredictableInterfaceNames '' + cp ${./80-net-name-slot.rules} $out/80-net-name-slot.rules ''} # If auto-configuration is disabled, then remove @@ -243,5 +243,9 @@ in fi ''; + systemd.services.systemd-udevd = + { environment.MODULE_DIR = "/run/booted-system/kernel-modules/lib/modules"; + }; + }; } diff --git a/nixos/modules/services/hardware/udisks2.nix b/nixos/modules/services/hardware/udisks2.nix index 0f61f20c33c3..f5b641c7378b 100644 --- a/nixos/modules/services/hardware/udisks2.nix +++ b/nixos/modules/services/hardware/udisks2.nix @@ -14,7 +14,7 @@ with lib; enable = mkOption { type = types.bool; - default = false; + default = true; description = '' Whether to enable Udisks, a DBus service that allows applications to query and manipulate storage devices. |