diff options
| author | Tom Gundersen <teg@jklm.no> | 2013-10-28 00:19:59 +0100 |
|---|---|---|
| committer | Tom Gundersen <teg@jklm.no> | 2013-10-28 01:18:04 +0100 |
| commit | daeb71a36a98834664e4d95773a3629b746f4db8 (patch) | |
| tree | 5b8aeab2278a26dace26feb13629d22e52c89500 /Makefile.am | |
| parent | 2a73e0d39a9bec82c3800071e375d27164727e71 (diff) | |
udev: link-config - move naming policy from udev rules
This introduces a new key NamePolicy, which takes an ordered list of naming
policies. The first successful one is applide. If all fail the value of Name
(if any) is used.
The possible policies are 'onboard', 'slot', 'path' and 'mac'.
This patch introduces a default link file, which replaces the equivalent udev
rule.
Diffstat (limited to 'Makefile.am')
| -rw-r--r-- | Makefile.am | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/Makefile.am b/Makefile.am index e5ed3020b1..4a96a50057 100644 --- a/Makefile.am +++ b/Makefile.am @@ -83,7 +83,7 @@ userunitdir=$(prefix)/lib/systemd/user userpresetdir=$(prefix)/lib/systemd/user-preset tmpfilesdir=$(prefix)/lib/tmpfiles.d sysctldir=$(prefix)/lib/sysctl.d -linkdir=$(prefix)/lib/net/links +linksdir=$(prefix)/lib/net/links pkgincludedir=$(includedir)/systemd systemgeneratordir=$(rootlibexecdir)/system-generators usergeneratordir=$(prefix)/lib/systemd/user-generators @@ -2214,6 +2214,9 @@ INSTALL_DIRS += \ $(sysconfdir)/udev/rules.d \ $(sysconfdir)/udev/hwdb.d +dist_links_DATA = \ + links/99-default.link + dist_udevrules_DATA += \ rules/99-systemd.rules \ rules/42-usb-hid-pm.rules \ @@ -2228,7 +2231,6 @@ dist_udevrules_DATA += \ rules/75-net-description.rules \ rules/75-tty-description.rules \ rules/78-sound-card.rules \ - rules/80-net-name-slot.rules \ rules/85-net-configure-link.rules \ rules/95-udev-late.rules |