udevadm: rename source files

diff --git a/NEWS b/NEWS
index 70cd0debbbe429fda2a4aec3c962d5b56c7ce7b9..8f7871d566c5f6be9a29219a5a4ebecd58569a60 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -6,6 +6,10 @@ The udevadm info --device-id-of-file= output has changed to use
 the obvious format. Possible current users should use the --export
 option which is not affected.
 
+The old udev commands symlinks to udevadm are not installed since
+a while, if these symlinks are used, a deprecation warning to stderr
+is printed.
+
 udev 127
 ========
 Bugfixes.

diff --git a/udev/Makefile.am b/udev/Makefile.am
index 4a7c7855ce042536d54c73706140fbfd29f37fe8..d123c0b3fd23af9aa01df7f1f6d137d02a04fb57 100644 (file)
--- a/udev/Makefile.am
+++ b/udev/Makefile.am
@@ -55,12 +55,12 @@ udevd_LDADD = \
 udevadm_SOURCES = \
        $(common_files) \
        udevadm.c \
-       udevinfo.c \
-       udevcontrol.c \
-       udevtest.c \
-       udevmonitor.c \
-       udevsettle.c \
-       udevtrigger.c
+       udevadm-info.c \
+       udevadm-control.c \
+       udevadm-test.c \
+       udevadm-monitor.c \
+       udevadm-settle.c \
+       udevadm-trigger.c
 
 udevadm_LDADD = \
        $(common_ldadd)

diff --git a/udev/udevcontrol.c b/udev/udevadm-control.c
similarity index 100%
rename from udev/udevcontrol.c
rename to udev/udevadm-control.c

diff --git a/udev/udevinfo.c b/udev/udevadm-info.c
similarity index 100%
rename from udev/udevinfo.c
rename to udev/udevadm-info.c

diff --git a/udev/udevmonitor.c b/udev/udevadm-monitor.c
similarity index 100%
rename from udev/udevmonitor.c
rename to udev/udevadm-monitor.c

diff --git a/udev/udevsettle.c b/udev/udevadm-settle.c
similarity index 100%
rename from udev/udevsettle.c
rename to udev/udevadm-settle.c

diff --git a/udev/udevtest.c b/udev/udevadm-test.c
similarity index 100%
rename from udev/udevtest.c
rename to udev/udevadm-test.c

diff --git a/udev/udevtrigger.c b/udev/udevadm-trigger.c
similarity index 100%
rename from udev/udevtrigger.c
rename to udev/udevadm-trigger.c

diff --git a/udev/udevd.h b/udev/udevd.h
index 7405704c7a15e66b78203afe79197c161610ddea..a22bc96e5d5564f013878ce4a667b07d18fc4455 100644 (file)
--- a/udev/udevd.h
+++ b/udev/udevd.h
@@ -32,7 +32,7 @@
 #define UEVENT_NUM_ENVP                        32
 
 #define UDEVD_CTRL_SOCK_PATH           "@" UDEV_PREFIX "/org/kernel/udev/udevd"
-#define UDEVD_CTRL_MAGIC               "udevd_" VERSION
+#define UDEVD_CTRL_MAGIC               "udevd-128"
 
 enum udevd_ctrl_msg_type {
        UDEVD_CTRL_UNKNOWN,