From: Colin Guthrie Date: Mon, 2 Jul 2012 19:35:14 +0000 (+0200) Subject: units: Rename systemd-udev.service to systemd-udevd.service X-Git-Tag: v186~13 X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=commitdiff_plain;h=51dfddc2cceb345ffc994014e4a4b3f2d2d3a3aa units: Rename systemd-udev.service to systemd-udevd.service 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. --- diff --git a/Makefile.am b/Makefile.am index 370ee2e64..857e6f446 100644 --- a/Makefile.am +++ b/Makefile.am @@ -309,8 +309,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/system-update.target nodist_systemunit_DATA = \ @@ -340,7 +340,7 @@ nodist_systemunit_DATA = \ units/systemd-kexec.service \ units/systemd-fsck@.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/debug-shell.service @@ -378,7 +378,7 @@ EXTRA_DIST += \ units/systemd-fsck@.service.in \ units/systemd-fsck-root.service.in \ units/user@.service.in \ - units/systemd-udev.service \ + units/systemd-udevd.service \ units/systemd-udev-trigger.service \ units/systemd-udev-settle.service \ units/debug-shell.service.in \ @@ -1492,7 +1492,7 @@ libudev_private_la_LIBADD = \ MANPAGES += \ man/udev.7 \ man/udevadm.8 \ - man/systemd-udev.service.8 + man/systemd-udevd.service.8 MANPAGES_ALIAS += \ man/systemd-udevd.8 @@ -1534,21 +1534,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 615c509fc..ce0b0509d 100644 --- a/TODO +++ b/TODO @@ -30,8 +30,6 @@ Features: /var/log/journal via NFS since the mount point has to exist and we 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: diff --git a/man/systemd-udev.service.xml b/man/systemd-udevd.service.xml similarity index 92% rename from man/systemd-udev.service.xml rename to man/systemd-udevd.service.xml index 537b49ff3..616c8f61f 100644 --- a/man/systemd-udev.service.xml +++ b/man/systemd-udevd.service.xml @@ -3,7 +3,7 @@ - + systemd-udevd.service systemd @@ -18,23 +18,23 @@ - systemd-udev.service + systemd-udevd.service 8 - systemd-udev.service - systemd-udev-control.socket - systemd-udev-kernel.socket + systemd-udevd.service + systemd-udevd-control.socket + systemd-udevd-kernel.socket systemd-udevd Device event managing daemon - systemd-udev.service - systemd-udev-control.socket - systemd-udev-kernel.socket + systemd-udevd.service + systemd-udevd-control.socket + systemd-udevd-kernel.socket /usr/lib/systemd/systemd-udevd diff --git a/units/.gitignore b/units/.gitignore index 3e434fe9e..544994da4 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 /debug-shell.service diff --git a/units/systemd-udev-settle.service.in b/units/systemd-udev-settle.service.in index 004b31618..b8844c51c 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 9d3f43e67..391f99693 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-control.socket b/units/systemd-udevd-control.socket similarity index 94% rename from units/systemd-udev-control.socket rename to units/systemd-udevd-control.socket index e7678a049..9065ea2c6 100644 --- a/units/systemd-udev-control.socket +++ b/units/systemd-udevd-control.socket @@ -12,7 +12,7 @@ DefaultDependencies=no ConditionCapability=CAP_MKNOD [Socket] -Service=systemd-udev.service +Service=systemd-udevd.service ListenSequentialPacket=/run/udev/control SocketMode=0600 PassCredentials=yes diff --git a/units/systemd-udev-kernel.socket b/units/systemd-udevd-kernel.socket similarity index 94% rename from units/systemd-udev-kernel.socket rename to units/systemd-udevd-kernel.socket index 588f9f5e4..54a005b7a 100644 --- a/units/systemd-udev-kernel.socket +++ b/units/systemd-udevd-kernel.socket @@ -12,7 +12,7 @@ DefaultDependencies=no ConditionCapability=CAP_MKNOD [Socket] -Service=systemd-udev.service +Service=systemd-udevd.service ReceiveBuffer=134217728 ListenNetlink=kobject-uevent 1 PassCredentials=yes diff --git a/units/systemd-udev.service.in b/units/systemd-udevd.service.in similarity index 74% rename from units/systemd-udev.service.in rename to units/systemd-udevd.service.in index b68969026..3bf33e526 100644 --- a/units/systemd-udev.service.in +++ b/units/systemd-udevd.service.in @@ -8,8 +8,8 @@ [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 +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 @@ -17,6 +17,6 @@ ConditionCapability=CAP_MKNOD [Service] Type=notify OOMScoreAdjust=-1000 -Sockets=systemd-udev-control.socket systemd-udev-kernel.socket +Sockets=systemd-udevd-control.socket systemd-udevd-kernel.socket Restart=always ExecStart=@rootlibexecdir@/systemd-udevd