[systemd-commits] 2 commits - Makefile.am rules/80-net-name-slot.rules src/analyze

[Kay Sievers]

 Makefile.am                  |    1 +
 rules/80-net-name-slot.rules |   11 +++++++++++
 src/analyze/.gitignore       |    1 +
 3 files changed, 13 insertions(+)

New commits:
commit a0169f00e5f7d193b495a2e451168c739179d60f
Author: Kay Sievers <kay at vrfy.org>
Date:   Sun Jan 6 16:18:48 2013 +0100

    analyze: add .gitignore

diff --git a/src/analyze/.gitignore b/src/analyze/.gitignore
new file mode 100644
index 0000000..752ea23
--- /dev/null
+++ b/src/analyze/.gitignore
@@ -0,0 +1 @@
+/systemd-analyze

commit 394e2938ff92c9bfc5b9e25c92c4df0fdea57c83
Author: Kay Sievers <kay at vrfy.org>
Date:   Sun Jan 6 16:17:33 2013 +0100

    udev: enable persistent network device naming

diff --git a/Makefile.am b/Makefile.am
index 74a4329..3a50f4a 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1838,6 +1838,7 @@ 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/95-udev-late.rules
 
 if HAVE_KMOD
diff --git a/rules/80-net-name-slot.rules b/rules/80-net-name-slot.rules
new file mode 100644
index 0000000..278e77f
--- /dev/null
+++ b/rules/80-net-name-slot.rules
@@ -0,0 +1,11 @@
+# do not edit this file, it will be overwritten on update
+
+ACTION=="remove", GOTO="net_name_slot_end"
+SUBSYSTEM!="net", GOTO="net_name_slot_end"
+NAME!="", GOTO="net_name_slot_end"
+
+ENV{ID_NET_NAME_ONBOARD}!="", NAME="$env{ID_NET_NAME_ONBOARD}"
+ENV{ID_NET_NAME_SLOT}!="", NAME="$env{ID_NET_NAME_SLOT}"
+ENV{ID_NET_NAME_PATH}!="", NAME="$env{ID_NET_NAME_PATH}"
+
+LABEL="net_name_slot_end"