From 51dfddc2cceb345ffc994014e4a4b3f2d2d3a3aa Mon Sep 17 00:00:00 2001 From: Colin Guthrie Date: Mon, 2 Jul 2012 21:35:14 +0200 Subject: 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. --- Makefile.am | 20 ++--- TODO | 2 - man/systemd-udev.service.xml | 163 ---------------------------------- man/systemd-udevd.service.xml | 163 ++++++++++++++++++++++++++++++++++ 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 +++++ 13 files changed, 235 insertions(+), 237 deletions(-) delete mode 100644 man/systemd-udev.service.xml create mode 100644 man/systemd-udevd.service.xml 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 370ee2e648..857e6f4464 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 615c509fc6..ce0b0509d8 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-udev.service.xml deleted file mode 100644 index 537b49ff30..0000000000 --- a/man/systemd-udev.service.xml +++ /dev/null @@ -1,163 +0,0 @@ - - - - - - - systemd-udevd.service - systemd - - - Developer - Kay - Sievers - kay@vrfy.org - - - - - - systemd-udev.service - 8 - - - - - systemd-udev.service - systemd-udev-control.socket - systemd-udev-kernel.socket - systemd-udevd - Device event managing daemon - - - - systemd-udev.service - systemd-udev-control.socket - systemd-udev-kernel.socket - - - /usr/lib/systemd/systemd-udevd - - - - - - - - - - - - Description - systemd-udevd listens to kernel uevents. For every event, systemd-udevd executes matching - instructions specified in udev rules. See - udev7 - . - The behavior of the running daemon can be changed with - udevadm control. - - - Options - - - - - Detach and run in the background. - - - - - - Print debug messages to stderr. - - - - - - Limit the number of parallel executed events. - - - - - - Number of seconds to delay the execution of RUN instructions. - This might be useful when debugging system crashes during coldplug - cause by loading non-working kernel modules. - - - - - - Specify when systemd-udevd should resolve names of users and groups. - When set to (the default) names will be - resolved when the rules are parsed. When set to - names will be resolved for every event. - When set to names will never be resolved - and all devices will be owned by root. - - - - - - Print version number. - - - - - - Print help text. - - - - - - Environment - - - UDEV_LOG= - - Set the logging priority. - - - - - - Kernel command line - - The parameters starting with "rd.", will be read when udev is used in an initrd. - - udev.log-priority= - rd.udev.log-priority= - - Set the logging priority. - - - - udev.children-max= - rd.udev.children-max= - - Limit the number of parallel executed events. - - - - udev.exec-delay= - rd.udev.exec-delay= - - Number of seconds to delay the execution of RUN instructions. - This might be useful when debugging system crashes during coldplug - cause by loading non-working kernel modules. - - - - - - - See Also - - udev7 - , - udevadm8 - - - diff --git a/man/systemd-udevd.service.xml b/man/systemd-udevd.service.xml new file mode 100644 index 0000000000..616c8f61f7 --- /dev/null +++ b/man/systemd-udevd.service.xml @@ -0,0 +1,163 @@ + + + + + + + systemd-udevd.service + systemd + + + Developer + Kay + Sievers + kay@vrfy.org + + + + + + systemd-udevd.service + 8 + + + + + systemd-udevd.service + systemd-udevd-control.socket + systemd-udevd-kernel.socket + systemd-udevd + Device event managing daemon + + + + systemd-udevd.service + systemd-udevd-control.socket + systemd-udevd-kernel.socket + + + /usr/lib/systemd/systemd-udevd + + + + + + + + + + + + Description + systemd-udevd listens to kernel uevents. For every event, systemd-udevd executes matching + instructions specified in udev rules. See + udev7 + . + The behavior of the running daemon can be changed with + udevadm control. + + + Options + + + + + Detach and run in the background. + + + + + + Print debug messages to stderr. + + + + + + Limit the number of parallel executed events. + + + + + + Number of seconds to delay the execution of RUN instructions. + This might be useful when debugging system crashes during coldplug + cause by loading non-working kernel modules. + + + + + + Specify when systemd-udevd should resolve names of users and groups. + When set to (the default) names will be + resolved when the rules are parsed. When set to + names will be resolved for every event. + When set to names will never be resolved + and all devices will be owned by root. + + + + + + Print version number. + + + + + + Print help text. + + + + + + Environment + + + UDEV_LOG= + + Set the logging priority. + + + + + + Kernel command line + + The parameters starting with "rd.", will be read when udev is used in an initrd. + + udev.log-priority= + rd.udev.log-priority= + + Set the logging priority. + + + + udev.children-max= + rd.udev.children-max= + + Limit the number of parallel executed events. + + + + udev.exec-delay= + rd.udev.exec-delay= + + Number of seconds to delay the execution of RUN instructions. + This might be useful when debugging system crashes during coldplug + cause by loading non-working kernel modules. + + + + + + + See Also + + udev7 + , + udevadm8 + + + diff --git a/units/.gitignore b/units/.gitignore index 3e434fe9e3..544994da4d 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-control.socket b/units/systemd-udev-control.socket deleted file mode 100644 index e7678a049e..0000000000 --- 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 588f9f5e44..0000000000 --- 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 004b316180..b8844c51c3 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 9d3f43e673..391f996930 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 b68969026b..0000000000 --- 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 0000000000..9065ea2c64 --- /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 0000000000..54a005b7a7 --- /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 0000000000..3bf33e5266 --- /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 -- cgit v1.2.3-54-g00ecf