[systemd-devel] [PATCH 2/2] units: Rename systemd-udev.service to systemd-udevd.service
Colin Guthrie
colin at mageia.org
Sat Jun 30 07:52:38 PDT 2012
This naming convention is more inline with other systemd daemon
unit names (systemd-logind.service, systemd-localed.service etc)
The companion .socket units have also been renamed, however the
-trigger and -settle units keep their current name as these are
not directly related to daemon process itself.
---
Makefile.am | 18 +++++++++---------
TODO | 2 --
man/systemd-udevd.service.xml | 4 ++--
units/.gitignore | 2 +-
units/systemd-udev-control.socket | 18 ------------------
units/systemd-udev-kernel.socket | 18 ------------------
units/systemd-udev-settle.service.in | 2 +-
units/systemd-udev-trigger.service.in | 4 ++--
units/systemd-udev.service.in | 22 ----------------------
units/systemd-udevd-control.socket | 18 ++++++++++++++++++
units/systemd-udevd-kernel.socket | 18 ++++++++++++++++++
units/systemd-udevd.service.in | 22 ++++++++++++++++++++++
12 files changed, 73 insertions(+), 75 deletions(-)
delete mode 100644 units/systemd-udev-control.socket
delete mode 100644 units/systemd-udev-kernel.socket
delete mode 100644 units/systemd-udev.service.in
create mode 100644 units/systemd-udevd-control.socket
create mode 100644 units/systemd-udevd-kernel.socket
create mode 100644 units/systemd-udevd.service.in
diff --git a/Makefile.am b/Makefile.am
index b6b148e..4375af9 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -307,8 +307,8 @@ dist_systemunit_DATA = \
units/systemd-ask-password-wall.path \
units/systemd-ask-password-console.path \
units/syslog.target \
- units/systemd-udev-control.socket \
- units/systemd-udev-kernel.socket \
+ units/systemd-udevd-control.socket \
+ units/systemd-udevd-kernel.socket \
units/systemd-timedated-ntp.target \
units/system-update.target
@@ -339,7 +339,7 @@ nodist_systemunit_DATA = \
units/systemd-kexec.service \
units/systemd-fsck at .service \
units/systemd-fsck-root.service \
- units/systemd-udev.service \
+ units/systemd-udevd.service \
units/systemd-udev-trigger.service \
units/systemd-udev-settle.service \
units/systemd-debug-shell.service
@@ -377,7 +377,7 @@ EXTRA_DIST += \
units/systemd-fsck at .service.in \
units/systemd-fsck-root.service.in \
units/user at .service.in \
- units/systemd-udev.service \
+ units/systemd-udevd.service \
units/systemd-udev-trigger.service \
units/systemd-udev-settle.service \
units/systemd-debug-shell.service.in \
@@ -1533,21 +1533,21 @@ CLEANFILES += \
src/udev/udev.pc
EXTRA_DIST += \
- units/systemd-udev.service.in \
+ units/systemd-udevd.service.in \
units/systemd-udev-trigger.service.in \
units/systemd-udev-settle.service.in
CLEANFILES += \
- units/systemd-udev.service \
+ units/systemd-udevd.service \
units/systemd-udev-trigger.service \
units/systemd-udev-settle.service
systemd-install-hook:
mkdir -p $(DESTDIR)$(systemunitdir)/sockets.target.wants
- ln -sf ../systemd-udev-control.socket $(DESTDIR)$(systemunitdir)/sockets.target.wants/systemd-udev-control.socket
- ln -sf ../systemd-udev-kernel.socket $(DESTDIR)$(systemunitdir)/sockets.target.wants/systemd-udev-kernel.socket
+ ln -sf ../systemd-udevd-control.socket $(DESTDIR)$(systemunitdir)/sockets.target.wants/systemd-udevd-control.socket
+ ln -sf ../systemd-udevd-kernel.socket $(DESTDIR)$(systemunitdir)/sockets.target.wants/systemd-udevd-kernel.socket
mkdir -p $(DESTDIR)$(systemunitdir)/sysinit.target.wants
- ln -sf ../systemd-udev.service $(DESTDIR)$(systemunitdir)/sysinit.target.wants/systemd-udev.service
+ ln -sf ../systemd-udevd.service $(DESTDIR)$(systemunitdir)/sysinit.target.wants/systemd-udevd.service
ln -sf ../systemd-udev-trigger.service $(DESTDIR)$(systemunitdir)/sysinit.target.wants/systemd-udev-trigger.service
INSTALL_DATA_HOOKS += systemd-install-hook
diff --git a/TODO b/TODO
index 1a7b60e..7e63e4d 100644
--- a/TODO
+++ b/TODO
@@ -25,8 +25,6 @@ Bugfixes:
Features:
-* rename systemd-udev.service to systemd-udevd.service
-
* document that journal data is primarily ASCII, UTF-8 where necessary and binary only where nothing else makes sense.
* Document:
diff --git a/man/systemd-udevd.service.xml b/man/systemd-udevd.service.xml
index c290b2f..0584fdb 100644
--- a/man/systemd-udevd.service.xml
+++ b/man/systemd-udevd.service.xml
@@ -24,7 +24,7 @@
</refmeta>
<refnamediv>
- <refname>systemd-udev.service</refname>
+ <refname>systemd-udevd.service</refname>
<refname>systemd-udev-control.socket</refname>
<refname>systemd-udev-kernel.socket</refname>
<refname>systemd-udevd</refname>
@@ -32,7 +32,7 @@
</refnamediv>
<refsynopsisdiv>
- <para><filename>systemd-udev.service</filename></para>
+ <para><filename>systemd-udevd.service</filename></para>
<para><filename>systemd-udev-control.socket</filename></para>
<para><filename>systemd-udev-kernel.socket</filename></para>
diff --git a/units/.gitignore b/units/.gitignore
index 2193bed..bb49ba4 100644
--- a/units/.gitignore
+++ b/units/.gitignore
@@ -41,5 +41,5 @@
/emergency.service
/systemd-udev-settle.service
/systemd-udev-trigger.service
-/systemd-udev.service
+/systemd-udevd.service
/systemd-debug-shell.service
diff --git a/units/systemd-udev-control.socket b/units/systemd-udev-control.socket
deleted file mode 100644
index e7678a0..0000000
--- a/units/systemd-udev-control.socket
+++ /dev/null
@@ -1,18 +0,0 @@
-# This file is part of systemd.
-#
-# systemd is free software; you can redistribute it and/or modify it
-# under the terms of the GNU Lesser General Public License as published by
-# the Free Software Foundation; either version 2.1 of the License, or
-# (at your option) any later version.
-
-[Unit]
-Description=udev Control Socket
-Documentation=man:systemd-udevd.service(8) man:udev(7)
-DefaultDependencies=no
-ConditionCapability=CAP_MKNOD
-
-[Socket]
-Service=systemd-udev.service
-ListenSequentialPacket=/run/udev/control
-SocketMode=0600
-PassCredentials=yes
diff --git a/units/systemd-udev-kernel.socket b/units/systemd-udev-kernel.socket
deleted file mode 100644
index 588f9f5..0000000
--- a/units/systemd-udev-kernel.socket
+++ /dev/null
@@ -1,18 +0,0 @@
-# This file is part of systemd.
-#
-# systemd is free software; you can redistribute it and/or modify it
-# under the terms of the GNU Lesser General Public License as published by
-# the Free Software Foundation; either version 2.1 of the License, or
-# (at your option) any later version.
-
-[Unit]
-Description=udev Kernel Socket
-Documentation=man:systemd-udevd.service(8) man:udev(7)
-DefaultDependencies=no
-ConditionCapability=CAP_MKNOD
-
-[Socket]
-Service=systemd-udev.service
-ReceiveBuffer=134217728
-ListenNetlink=kobject-uevent 1
-PassCredentials=yes
diff --git a/units/systemd-udev-settle.service.in b/units/systemd-udev-settle.service.in
index 004b316..b8844c5 100644
--- a/units/systemd-udev-settle.service.in
+++ b/units/systemd-udev-settle.service.in
@@ -19,7 +19,7 @@
Description=udev Wait for Complete Device Initialization
Documentation=man:udev(7) man:systemd-udevd.service(8)
DefaultDependencies=no
-Wants=systemd-udev.service
+Wants=systemd-udevd.service
After=systemd-udev-trigger.service
Before=basic.target
ConditionCapability=CAP_MKNOD
diff --git a/units/systemd-udev-trigger.service.in b/units/systemd-udev-trigger.service.in
index 9d3f43e..391f996 100644
--- a/units/systemd-udev-trigger.service.in
+++ b/units/systemd-udev-trigger.service.in
@@ -8,8 +8,8 @@
[Unit]
Description=udev Coldplug all Devices
Documentation=man:udev(7) man:systemd-udevd.service(8)
-Wants=systemd-udev.service
-After=systemd-udev-kernel.socket systemd-udev-control.socket
+Wants=systemd-udevd.service
+After=systemd-udevd-kernel.socket systemd-udevd-control.socket
DefaultDependencies=no
ConditionCapability=CAP_MKNOD
diff --git a/units/systemd-udev.service.in b/units/systemd-udev.service.in
deleted file mode 100644
index b689690..0000000
--- a/units/systemd-udev.service.in
+++ /dev/null
@@ -1,22 +0,0 @@
-# This file is part of systemd.
-#
-# systemd is free software; you can redistribute it and/or modify it
-# under the terms of the GNU Lesser General Public License as published by
-# the Free Software Foundation; either version 2.1 of the License, or
-# (at your option) any later version.
-
-[Unit]
-Description=udev Kernel Device Manager
-Documentation=man:systemd-udevd.service(8) man:udev(7)
-Wants=systemd-udev-control.socket systemd-udev-kernel.socket
-After=systemd-udev-control.socket systemd-udev-kernel.socket
-Before=basic.target
-DefaultDependencies=no
-ConditionCapability=CAP_MKNOD
-
-[Service]
-Type=notify
-OOMScoreAdjust=-1000
-Sockets=systemd-udev-control.socket systemd-udev-kernel.socket
-Restart=always
-ExecStart=@rootlibexecdir@/systemd-udevd
diff --git a/units/systemd-udevd-control.socket b/units/systemd-udevd-control.socket
new file mode 100644
index 0000000..9065ea2
--- /dev/null
+++ b/units/systemd-udevd-control.socket
@@ -0,0 +1,18 @@
+# This file is part of systemd.
+#
+# systemd is free software; you can redistribute it and/or modify it
+# under the terms of the GNU Lesser General Public License as published by
+# the Free Software Foundation; either version 2.1 of the License, or
+# (at your option) any later version.
+
+[Unit]
+Description=udev Control Socket
+Documentation=man:systemd-udevd.service(8) man:udev(7)
+DefaultDependencies=no
+ConditionCapability=CAP_MKNOD
+
+[Socket]
+Service=systemd-udevd.service
+ListenSequentialPacket=/run/udev/control
+SocketMode=0600
+PassCredentials=yes
diff --git a/units/systemd-udevd-kernel.socket b/units/systemd-udevd-kernel.socket
new file mode 100644
index 0000000..54a005b
--- /dev/null
+++ b/units/systemd-udevd-kernel.socket
@@ -0,0 +1,18 @@
+# This file is part of systemd.
+#
+# systemd is free software; you can redistribute it and/or modify it
+# under the terms of the GNU Lesser General Public License as published by
+# the Free Software Foundation; either version 2.1 of the License, or
+# (at your option) any later version.
+
+[Unit]
+Description=udev Kernel Socket
+Documentation=man:systemd-udevd.service(8) man:udev(7)
+DefaultDependencies=no
+ConditionCapability=CAP_MKNOD
+
+[Socket]
+Service=systemd-udevd.service
+ReceiveBuffer=134217728
+ListenNetlink=kobject-uevent 1
+PassCredentials=yes
diff --git a/units/systemd-udevd.service.in b/units/systemd-udevd.service.in
new file mode 100644
index 0000000..3bf33e5
--- /dev/null
+++ b/units/systemd-udevd.service.in
@@ -0,0 +1,22 @@
+# This file is part of systemd.
+#
+# systemd is free software; you can redistribute it and/or modify it
+# under the terms of the GNU Lesser General Public License as published by
+# the Free Software Foundation; either version 2.1 of the License, or
+# (at your option) any later version.
+
+[Unit]
+Description=udev Kernel Device Manager
+Documentation=man:systemd-udevd.service(8) man:udev(7)
+Wants=systemd-udevd-control.socket systemd-udevd-kernel.socket
+After=systemd-udevd-control.socket systemd-udevd-kernel.socket
+Before=basic.target
+DefaultDependencies=no
+ConditionCapability=CAP_MKNOD
+
+[Service]
+Type=notify
+OOMScoreAdjust=-1000
+Sockets=systemd-udevd-control.socket systemd-udevd-kernel.socket
+Restart=always
+ExecStart=@rootlibexecdir@/systemd-udevd
--
1.7.11
More information about the systemd-devel
mailing list