public
/
nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #13059 from abbradar/udev-local-priority 

Make local udev rules higher prioritized
This commit is contained in:
Eelco Dolstra 2016-02-23 16:41:47 +01:00
parent 40ca841c5c 32df5ed4c2
commit cacf2d063e
2 changed files with 11 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
nixos/doc/manual/release-notes/rl-unstable.xml
View File

@ -224,6 +224,13 @@ programs.ibus.plugins = with pkgs; [ ibus-anthy mozc ];
</para> </para>
</listitem> </listitem>
<listitem>
<para><literal>services.udev.extraRules</literal> option now writes rules
to <filename>99-local.rules</filename> instead of <filename>10-local.rules</filename>.
This makes all the user rules apply after others, so their results wouldn't be
overriden by anything else.</para>
</listitem>
</itemizedlist> </itemizedlist>

8
nixos/modules/services/hardware/udev.nix
View File

@ -13,13 +13,13 @@ let
extraUdevRules = pkgs.writeTextFile { extraUdevRules = pkgs.writeTextFile {
name = "extra-udev-rules"; name = "extra-udev-rules";
text = cfg.extraRules; text = cfg.extraRules;
destination = "/etc/udev/rules.d/10-local.rules"; destination = "/etc/udev/rules.d/99-local.rules";
}; };
extraHwdbFile = pkgs.writeTextFile { extraHwdbFile = pkgs.writeTextFile {
name = "extra-hwdb-file"; name = "extra-hwdb-file";
text = cfg.extraHwdb; text = cfg.extraHwdb;
destination = "/etc/udev/hwdb.d/10-local.hwdb"; destination = "/etc/udev/hwdb.d/99-local.hwdb";
}; };
nixosRules = '' nixosRules = ''
@ -212,8 +212,8 @@ in
type = types.lines; type = types.lines;
description = '' description = ''
Additional <command>udev</command> rules. They'll be written Additional <command>udev</command> rules. They'll be written
into file <filename>10-local.rules</filename>. Thus they are into file <filename>99-local.rules</filename>. Thus they are
read before all other rules. read and applied after all other rules.
''; '';
}; };