diff options
| -rw-r--r-- | rules/60-keyboard.rules | 2 | ||||
| -rw-r--r-- | rules/80-net-name-slot.rules | 14 | ||||
| -rw-r--r-- | rules/80-net-setup-link.rules | 13 | ||||
| -rw-r--r-- | rules/Makefile.am | 3 |
4 files changed, 2 insertions, 30 deletions
diff --git a/rules/60-keyboard.rules b/rules/60-keyboard.rules index fcb948ac02..e534b454dc 100644 --- a/rules/60-keyboard.rules +++ b/rules/60-keyboard.rules @@ -9,7 +9,7 @@ IMPORT{builtin}="hwdb --subsystem=input --lookup-prefix=keyboard:", \ RUN{builtin}+="keyboard", GOTO="keyboard_end" # AT keyboard matching by the machine's DMI data -DRIVERS=="atkbd", IMPORT{builtin}="hwdb 'keyboard:atkbd:$attr{[dmi/id]modalias}'", \ +DRIVERS=="atkbd", IMPORT{builtin}="hwdb 'keyboard:$attr{[dmi/id]modalias}'", \ RUN{builtin}+="keyboard", GOTO="keyboard_end" # device matching the input device name and the machine's DMI data diff --git a/rules/80-net-name-slot.rules b/rules/80-net-name-slot.rules deleted file mode 100644 index c5f1b3885b..0000000000 --- a/rules/80-net-name-slot.rules +++ /dev/null @@ -1,14 +0,0 @@ -# do not edit this file, it will be overwritten on update - -ACTION!="add", 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/rules/80-net-setup-link.rules b/rules/80-net-setup-link.rules deleted file mode 100644 index 6e411a91f0..0000000000 --- a/rules/80-net-setup-link.rules +++ /dev/null @@ -1,13 +0,0 @@ -# do not edit this file, it will be overwritten on update - -SUBSYSTEM!="net", GOTO="net_setup_link_end" - -IMPORT{builtin}="path_id" - -ACTION!="add", GOTO="net_setup_link_end" - -IMPORT{builtin}="net_setup_link" - -NAME=="", ENV{ID_NET_NAME}!="", NAME="$env{ID_NET_NAME}" - -LABEL="net_setup_link_end" diff --git a/rules/Makefile.am b/rules/Makefile.am index 7471a6c3d7..d9675a68af 100644 --- a/rules/Makefile.am +++ b/rules/Makefile.am @@ -18,8 +18,7 @@ dist_udevrules_DATA = \ 70-touchpad.rules \ 75-net-description.rules \ 75-probe_mtd.rules \ - 78-sound-card.rules \ - 80-net-name-slot.rules + 78-sound-card.rules if HAVE_BLKID dist_udevrules_DATA += \ |