picnoir/Systemd
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

units: Rename systemd-udev.service to systemd-udevd.service

Browse source 
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.
This commit is contained in:
Colin Guthrie 2012-07-02 21:35:14 +02:00 committed by Lennart Poettering
parent ef8a2bf648
commit 51dfddc2cc
9 changed files with 27 additions and 29 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
Makefile.am
View file

@ -309,8 +309,8 @@ dist_systemunit_DATA = \
units/systemd-ask-password-wall.path \ units/systemd-ask-password-wall.path \
units/systemd-ask-password-console.path \ units/systemd-ask-password-console.path \
units/syslog.target \ units/syslog.target \
units/systemd-udev-control.socket \ units/systemd-udevd-control.socket \
units/systemd-udev-kernel.socket \ units/systemd-udevd-kernel.socket \
units/system-update.target units/system-update.target
nodist_systemunit_DATA = \ nodist_systemunit_DATA = \
@ -340,7 +340,7 @@ nodist_systemunit_DATA = \
units/systemd-kexec.service \ units/systemd-kexec.service \
units/systemd-fsck@.service \ units/systemd-fsck@.service \
units/systemd-fsck-root.service \ units/systemd-fsck-root.service \
units/systemd-udev.service \ units/systemd-udevd.service \
units/systemd-udev-trigger.service \ units/systemd-udev-trigger.service \
units/systemd-udev-settle.service \ units/systemd-udev-settle.service \
units/debug-shell.service units/debug-shell.service
@ -378,7 +378,7 @@ EXTRA_DIST += \
units/systemd-fsck@.service.in \ units/systemd-fsck@.service.in \
units/systemd-fsck-root.service.in \ units/systemd-fsck-root.service.in \
units/user@.service.in \ units/user@.service.in \
units/systemd-udev.service \ units/systemd-udevd.service \
units/systemd-udev-trigger.service \ units/systemd-udev-trigger.service \
units/systemd-udev-settle.service \ units/systemd-udev-settle.service \
units/debug-shell.service.in \ units/debug-shell.service.in \
@ -1492,7 +1492,7 @@ libudev_private_la_LIBADD = \
MANPAGES += \ MANPAGES += \
man/udev.7 \ man/udev.7 \
man/udevadm.8 \ man/udevadm.8 \
man/systemd-udev.service.8 man/systemd-udevd.service.8
MANPAGES_ALIAS += \ MANPAGES_ALIAS += \
man/systemd-udevd.8 man/systemd-udevd.8
@ -1534,21 +1534,21 @@ CLEANFILES += \
src/udev/udev.pc src/udev/udev.pc
EXTRA_DIST += \ EXTRA_DIST += \
units/systemd-udev.service.in \ units/systemd-udevd.service.in \
units/systemd-udev-trigger.service.in \ units/systemd-udev-trigger.service.in \
units/systemd-udev-settle.service.in units/systemd-udev-settle.service.in
CLEANFILES += \ CLEANFILES += \
units/systemd-udev.service \ units/systemd-udevd.service \
units/systemd-udev-trigger.service \ units/systemd-udev-trigger.service \
units/systemd-udev-settle.service units/systemd-udev-settle.service
systemd-install-hook: systemd-install-hook:
mkdir -p $(DESTDIR)$(systemunitdir)/sockets.target.wants 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-udevd-control.socket $(DESTDIR)$(systemunitdir)/sockets.target.wants/systemd-udevd-control.socket
ln -sf ../systemd-udev-kernel.socket $(DESTDIR)$(systemunitdir)/sockets.target.wants/systemd-udev-kernel.socket ln -sf ../systemd-udevd-kernel.socket $(DESTDIR)$(systemunitdir)/sockets.target.wants/systemd-udevd-kernel.socket
mkdir -p $(DESTDIR)$(systemunitdir)/sysinit.target.wants 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 ln -sf ../systemd-udev-trigger.service $(DESTDIR)$(systemunitdir)/sysinit.target.wants/systemd-udev-trigger.service
INSTALL_DATA_HOOKS += systemd-install-hook INSTALL_DATA_HOOKS += systemd-install-hook

2
TODO
View file

@ -30,8 +30,6 @@ Features:
/var/log/journal via NFS since the mount point has to exist and we /var/log/journal via NFS since the mount point has to exist and we
already take that as signal to store our stuff there. already take that as signal to store our stuff there.
* 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 that journal data is primarily ASCII, UTF-8 where necessary and binary only where nothing else makes sense.
* Document: * Document:

16
man/systemd-udev.service.xml → man/systemd-udevd.service.xml
View file

@ -3,7 +3,7 @@
<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN" <!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN"
"http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd"> "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd">
<refentry id="systemd-udev.service"> <refentry id="systemd-udevd.service">
<refentryinfo> <refentryinfo>
<title>systemd-udevd.service</title> <title>systemd-udevd.service</title>
<productname>systemd</productname> <productname>systemd</productname>
@ -18,23 +18,23 @@
</refentryinfo> </refentryinfo>
<refmeta> <refmeta>
<refentrytitle>systemd-udev.service</refentrytitle> <refentrytitle>systemd-udevd.service</refentrytitle>
<manvolnum>8</manvolnum> <manvolnum>8</manvolnum>
<refmiscinfo class="version"></refmiscinfo> <refmiscinfo class="version"></refmiscinfo>
</refmeta> </refmeta>
<refnamediv> <refnamediv>
<refname>systemd-udev.service</refname> <refname>systemd-udevd.service</refname>
<refname>systemd-udev-control.socket</refname> <refname>systemd-udevd-control.socket</refname>
<refname>systemd-udev-kernel.socket</refname> <refname>systemd-udevd-kernel.socket</refname>
<refname>systemd-udevd</refname> <refname>systemd-udevd</refname>
<refpurpose>Device event managing daemon</refpurpose> <refpurpose>Device event managing daemon</refpurpose>
</refnamediv> </refnamediv>
<refsynopsisdiv> <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-udevd-control.socket</filename></para>
<para><filename>systemd-udev-kernel.socket</filename></para> <para><filename>systemd-udevd-kernel.socket</filename></para>
<cmdsynopsis> <cmdsynopsis>
<command>/usr/lib/systemd/systemd-udevd</command> <command>/usr/lib/systemd/systemd-udevd</command>

2
units/.gitignore vendored
View file

@ -41,5 +41,5 @@
/emergency.service /emergency.service
/systemd-udev-settle.service /systemd-udev-settle.service
/systemd-udev-trigger.service /systemd-udev-trigger.service
/systemd-udev.service /systemd-udevd.service
/debug-shell.service /debug-shell.service

2
units/systemd-udev-settle.service.in
View file

@ -19,7 +19,7 @@
Description=udev Wait for Complete Device Initialization Description=udev Wait for Complete Device Initialization
Documentation=man:udev(7) man:systemd-udevd.service(8) Documentation=man:udev(7) man:systemd-udevd.service(8)
DefaultDependencies=no DefaultDependencies=no
Wants=systemd-udev.service Wants=systemd-udevd.service
After=systemd-udev-trigger.service After=systemd-udev-trigger.service
Before=basic.target Before=basic.target
ConditionCapability=CAP_MKNOD ConditionCapability=CAP_MKNOD

4
units/systemd-udev-trigger.service.in
View file

@ -8,8 +8,8 @@
[Unit] [Unit]
Description=udev Coldplug all Devices Description=udev Coldplug all Devices
Documentation=man:udev(7) man:systemd-udevd.service(8) Documentation=man:udev(7) man:systemd-udevd.service(8)
Wants=systemd-udev.service Wants=systemd-udevd.service
After=systemd-udev-kernel.socket systemd-udev-control.socket After=systemd-udevd-kernel.socket systemd-udevd-control.socket
DefaultDependencies=no DefaultDependencies=no
ConditionCapability=CAP_MKNOD ConditionCapability=CAP_MKNOD

2
units/systemd-udev-control.socket → units/systemd-udevd-control.socket
View file

@ -12,7 +12,7 @@ DefaultDependencies=no
ConditionCapability=CAP_MKNOD ConditionCapability=CAP_MKNOD
[Socket] [Socket]
Service=systemd-udev.service Service=systemd-udevd.service
ListenSequentialPacket=/run/udev/control ListenSequentialPacket=/run/udev/control
SocketMode=0600 SocketMode=0600
PassCredentials=yes PassCredentials=yes

2
units/systemd-udev-kernel.socket → units/systemd-udevd-kernel.socket
View file

@ -12,7 +12,7 @@ DefaultDependencies=no
ConditionCapability=CAP_MKNOD ConditionCapability=CAP_MKNOD
[Socket] [Socket]
Service=systemd-udev.service Service=systemd-udevd.service
ReceiveBuffer=134217728 ReceiveBuffer=134217728
ListenNetlink=kobject-uevent 1 ListenNetlink=kobject-uevent 1
PassCredentials=yes PassCredentials=yes

6
units/systemd-udev.service.in → units/systemd-udevd.service.in
View file

@ -8,8 +8,8 @@
[Unit] [Unit]
Description=udev Kernel Device Manager Description=udev Kernel Device Manager
Documentation=man:systemd-udevd.service(8) man:udev(7) Documentation=man:systemd-udevd.service(8) man:udev(7)
Wants=systemd-udev-control.socket systemd-udev-kernel.socket Wants=systemd-udevd-control.socket systemd-udevd-kernel.socket
After=systemd-udev-control.socket systemd-udev-kernel.socket After=systemd-udevd-control.socket systemd-udevd-kernel.socket
Before=basic.target Before=basic.target
DefaultDependencies=no DefaultDependencies=no
ConditionCapability=CAP_MKNOD ConditionCapability=CAP_MKNOD
@ -17,6 +17,6 @@ ConditionCapability=CAP_MKNOD
[Service] [Service]
Type=notify Type=notify
OOMScoreAdjust=-1000 OOMScoreAdjust=-1000
Sockets=systemd-udev-control.socket systemd-udev-kernel.socket Sockets=systemd-udevd-control.socket systemd-udevd-kernel.socket
Restart=always Restart=always
ExecStart=@rootlibexecdir@/systemd-udevd ExecStart=@rootlibexecdir@/systemd-udevd