From ef2ad30aee9fa99b0fdb8fe7efda397513cec6af Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= Date: Tue, 8 Oct 2019 16:43:18 +0200 Subject: [PATCH] Rename udev's rules/ to rules.d/ This change is only about the source tree. We have tmpfiles.d/, modprobe.d/, sysctl.d/, and sysusers.d/, but for historical reasons, rules/ didn't fit this pattern. We also *install* it as rules.d/. Let's rename to be consistent. --- meson.build | 2 +- {rules => rules.d}/50-udev-default.rules.in | 0 {rules => rules.d}/60-block.rules | 0 {rules => rules.d}/60-cdrom_id.rules | 0 {rules => rules.d}/60-drm.rules | 0 {rules => rules.d}/60-evdev.rules | 0 {rules => rules.d}/60-fido-id.rules | 0 {rules => rules.d}/60-input-id.rules | 0 {rules => rules.d}/60-persistent-alsa.rules | 0 {rules => rules.d}/60-persistent-input.rules | 0 {rules => rules.d}/60-persistent-storage-tape.rules | 0 {rules => rules.d}/60-persistent-storage.rules | 0 {rules => rules.d}/60-persistent-v4l.rules | 0 {rules => rules.d}/60-sensor.rules | 0 {rules => rules.d}/60-serial.rules | 0 {rules => rules.d}/61-autosuspend-manual.rules | 1 - {rules => rules.d}/64-btrfs.rules.in | 0 {rules => rules.d}/70-joystick.rules | 0 {rules => rules.d}/70-mouse.rules | 0 {rules => rules.d}/70-touchpad.rules | 0 {rules => rules.d}/75-net-description.rules | 0 {rules => rules.d}/75-probe_mtd.rules | 0 {rules => rules.d}/78-sound-card.rules | 0 {rules => rules.d}/80-drivers.rules | 0 {rules => rules.d}/80-net-setup-link.rules | 0 {rules => rules.d}/99-systemd.rules.in | 0 {rules => rules.d}/meson.build | 0 27 files changed, 1 insertion(+), 2 deletions(-) rename {rules => rules.d}/50-udev-default.rules.in (100%) rename {rules => rules.d}/60-block.rules (100%) rename {rules => rules.d}/60-cdrom_id.rules (100%) rename {rules => rules.d}/60-drm.rules (100%) rename {rules => rules.d}/60-evdev.rules (100%) rename {rules => rules.d}/60-fido-id.rules (100%) rename {rules => rules.d}/60-input-id.rules (100%) rename {rules => rules.d}/60-persistent-alsa.rules (100%) rename {rules => rules.d}/60-persistent-input.rules (100%) rename {rules => rules.d}/60-persistent-storage-tape.rules (100%) rename {rules => rules.d}/60-persistent-storage.rules (100%) rename {rules => rules.d}/60-persistent-v4l.rules (100%) rename {rules => rules.d}/60-sensor.rules (100%) rename {rules => rules.d}/60-serial.rules (100%) rename {rules => rules.d}/61-autosuspend-manual.rules (99%) rename {rules => rules.d}/64-btrfs.rules.in (100%) rename {rules => rules.d}/70-joystick.rules (100%) rename {rules => rules.d}/70-mouse.rules (100%) rename {rules => rules.d}/70-touchpad.rules (100%) rename {rules => rules.d}/75-net-description.rules (100%) rename {rules => rules.d}/75-probe_mtd.rules (100%) rename {rules => rules.d}/78-sound-card.rules (100%) rename {rules => rules.d}/80-drivers.rules (100%) rename {rules => rules.d}/80-net-setup-link.rules (100%) rename {rules => rules.d}/99-systemd.rules.in (100%) rename {rules => rules.d}/meson.build (100%) diff --git a/meson.build b/meson.build index 1172516454b..763ff55dd4d 100644 --- a/meson.build +++ b/meson.build @@ -1499,7 +1499,7 @@ subdir('src/boot/efi') subdir('src/test') subdir('src/fuzz') -subdir('rules') +subdir('rules.d') subdir('test') ############################################################ diff --git a/rules/50-udev-default.rules.in b/rules.d/50-udev-default.rules.in similarity index 100% rename from rules/50-udev-default.rules.in rename to rules.d/50-udev-default.rules.in diff --git a/rules/60-block.rules b/rules.d/60-block.rules similarity index 100% rename from rules/60-block.rules rename to rules.d/60-block.rules diff --git a/rules/60-cdrom_id.rules b/rules.d/60-cdrom_id.rules similarity index 100% rename from rules/60-cdrom_id.rules rename to rules.d/60-cdrom_id.rules diff --git a/rules/60-drm.rules b/rules.d/60-drm.rules similarity index 100% rename from rules/60-drm.rules rename to rules.d/60-drm.rules diff --git a/rules/60-evdev.rules b/rules.d/60-evdev.rules similarity index 100% rename from rules/60-evdev.rules rename to rules.d/60-evdev.rules diff --git a/rules/60-fido-id.rules b/rules.d/60-fido-id.rules similarity index 100% rename from rules/60-fido-id.rules rename to rules.d/60-fido-id.rules diff --git a/rules/60-input-id.rules b/rules.d/60-input-id.rules similarity index 100% rename from rules/60-input-id.rules rename to rules.d/60-input-id.rules diff --git a/rules/60-persistent-alsa.rules b/rules.d/60-persistent-alsa.rules similarity index 100% rename from rules/60-persistent-alsa.rules rename to rules.d/60-persistent-alsa.rules diff --git a/rules/60-persistent-input.rules b/rules.d/60-persistent-input.rules similarity index 100% rename from rules/60-persistent-input.rules rename to rules.d/60-persistent-input.rules diff --git a/rules/60-persistent-storage-tape.rules b/rules.d/60-persistent-storage-tape.rules similarity index 100% rename from rules/60-persistent-storage-tape.rules rename to rules.d/60-persistent-storage-tape.rules diff --git a/rules/60-persistent-storage.rules b/rules.d/60-persistent-storage.rules similarity index 100% rename from rules/60-persistent-storage.rules rename to rules.d/60-persistent-storage.rules diff --git a/rules/60-persistent-v4l.rules b/rules.d/60-persistent-v4l.rules similarity index 100% rename from rules/60-persistent-v4l.rules rename to rules.d/60-persistent-v4l.rules diff --git a/rules/60-sensor.rules b/rules.d/60-sensor.rules similarity index 100% rename from rules/60-sensor.rules rename to rules.d/60-sensor.rules diff --git a/rules/60-serial.rules b/rules.d/60-serial.rules similarity index 100% rename from rules/60-serial.rules rename to rules.d/60-serial.rules diff --git a/rules/61-autosuspend-manual.rules b/rules.d/61-autosuspend-manual.rules similarity index 99% rename from rules/61-autosuspend-manual.rules rename to rules.d/61-autosuspend-manual.rules index 4ca6e1b11b3..2b973af960a 100644 --- a/rules/61-autosuspend-manual.rules +++ b/rules.d/61-autosuspend-manual.rules @@ -17,4 +17,3 @@ LABEL="autosuspend_manual_enable" TEST=="power/control", ATTR{power/control}="auto", GOTO="autosuspend_manual_end" LABEL="autosuspend_manual_end" - diff --git a/rules/64-btrfs.rules.in b/rules.d/64-btrfs.rules.in similarity index 100% rename from rules/64-btrfs.rules.in rename to rules.d/64-btrfs.rules.in diff --git a/rules/70-joystick.rules b/rules.d/70-joystick.rules similarity index 100% rename from rules/70-joystick.rules rename to rules.d/70-joystick.rules diff --git a/rules/70-mouse.rules b/rules.d/70-mouse.rules similarity index 100% rename from rules/70-mouse.rules rename to rules.d/70-mouse.rules diff --git a/rules/70-touchpad.rules b/rules.d/70-touchpad.rules similarity index 100% rename from rules/70-touchpad.rules rename to rules.d/70-touchpad.rules diff --git a/rules/75-net-description.rules b/rules.d/75-net-description.rules similarity index 100% rename from rules/75-net-description.rules rename to rules.d/75-net-description.rules diff --git a/rules/75-probe_mtd.rules b/rules.d/75-probe_mtd.rules similarity index 100% rename from rules/75-probe_mtd.rules rename to rules.d/75-probe_mtd.rules diff --git a/rules/78-sound-card.rules b/rules.d/78-sound-card.rules similarity index 100% rename from rules/78-sound-card.rules rename to rules.d/78-sound-card.rules diff --git a/rules/80-drivers.rules b/rules.d/80-drivers.rules similarity index 100% rename from rules/80-drivers.rules rename to rules.d/80-drivers.rules diff --git a/rules/80-net-setup-link.rules b/rules.d/80-net-setup-link.rules similarity index 100% rename from rules/80-net-setup-link.rules rename to rules.d/80-net-setup-link.rules diff --git a/rules/99-systemd.rules.in b/rules.d/99-systemd.rules.in similarity index 100% rename from rules/99-systemd.rules.in rename to rules.d/99-systemd.rules.in diff --git a/rules/meson.build b/rules.d/meson.build similarity index 100% rename from rules/meson.build rename to rules.d/meson.build