From: Kay Sievers <kay@vrfy.org>
Date: Thu, 12 Mar 2015 15:34:18 +0000 (+0100)
Subject: rules: merge udev-late.rules files
X-Git-Tag: v219.0~369
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=commitdiff_plain;h=654b036ba7368d2f9f2577e2d64d45d52fa8262a

rules: merge udev-late.rules files
---

diff --git a/Makefile.am b/Makefile.am
index 9b29ecf33..e36e9db48 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -3701,8 +3701,7 @@ dist_udevrules_DATA += \
 	rules/75-net-description.rules \
 	rules/75-tty-description.rules \
 	rules/78-sound-card.rules \
-	rules/80-net-setup-link.rules \
-	rules/95-udev-late.rules
+	rules/80-net-setup-link.rules
 
 nodist_udevrules_DATA += \
 	rules/99-systemd.rules
diff --git a/rules/50-udev-default.rules b/rules/50-udev-default.rules
index d83add20a..03a42f0d0 100644
--- a/rules/50-udev-default.rules
+++ b/rules/50-udev-default.rules
@@ -1,5 +1,8 @@
 # do not edit this file, it will be overwritten on update
 
+# run a command on remove events
+ACTION=="remove", ENV{REMOVE_CMD}!="", RUN+="$env{REMOVE_CMD}"
+
 SUBSYSTEM=="virtio-ports", KERNEL=="vport*", ATTR{name}=="?*", SYMLINK+="virtio-ports/$attr{name}"
 
 # select "system RTC" or just use the first one
@@ -10,7 +13,7 @@ SUBSYSTEM=="usb", ENV{DEVTYPE}=="usb_device", IMPORT{builtin}="usb_id", IMPORT{b
 SUBSYSTEM=="input", ENV{ID_INPUT}=="", IMPORT{builtin}="input_id"
 ENV{MODALIAS}!="", IMPORT{builtin}="hwdb --subsystem=$env{SUBSYSTEM}"
 
-ACTION!="add", GOTO="default_permissions_end"
+ACTION!="add", GOTO="default_end"
 
 SUBSYSTEM=="tty", KERNEL=="ptmx", GROUP="tty", MODE="0666"
 SUBSYSTEM=="tty", KERNEL=="tty", GROUP="tty", MODE="0666"
@@ -70,4 +73,4 @@ KERNEL=="tun", MODE="0666", OPTIONS+="static_node=net/tun"
 
 KERNEL=="fuse", MODE="0666", OPTIONS+="static_node=fuse"
 
-LABEL="default_permissions_end"
+LABEL="default_end"
diff --git a/rules/95-udev-late.rules b/rules/95-udev-late.rules
deleted file mode 100644
index eca0faa5c..000000000
--- a/rules/95-udev-late.rules
+++ /dev/null
@@ -1,4 +0,0 @@
-# do not edit this file, it will be overwritten on update
-
-# run a command on remove events
-ACTION=="remove", ENV{REMOVE_CMD}!="", RUN+="$env{REMOVE_CMD}"