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. --- 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 ++++++++++++++++++++++ 9 files changed, 62 insertions(+), 62 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 (limited to 'units') 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