From f13b388f97bc3ba8db844bd3413d510e2466a0b6 Mon Sep 17 00:00:00 2001 From: Kay Sievers Date: Mon, 16 Apr 2012 23:32:22 +0200 Subject: udev: install udevd as /usr/lib/systemd/systemd-udevd --- units/.gitignore | 6 +++--- units/systemd-udev-control.socket | 10 ++++++++++ units/systemd-udev-kernel.socket | 10 ++++++++++ units/systemd-udev-settle.service.in | 26 ++++++++++++++++++++++++++ units/systemd-udev-trigger.service.in | 11 +++++++++++ units/systemd-udev.service.in | 14 ++++++++++++++ units/udev-control.socket | 10 ---------- units/udev-kernel.socket | 10 ---------- units/udev-settle.service.in | 26 -------------------------- units/udev-trigger.service.in | 11 ----------- units/udev.service.in | 14 -------------- 11 files changed, 74 insertions(+), 74 deletions(-) create mode 100644 units/systemd-udev-control.socket create mode 100644 units/systemd-udev-kernel.socket create mode 100644 units/systemd-udev-settle.service.in create mode 100644 units/systemd-udev-trigger.service.in create mode 100644 units/systemd-udev.service.in delete mode 100644 units/udev-control.socket delete mode 100644 units/udev-kernel.socket delete mode 100644 units/udev-settle.service.in delete mode 100644 units/udev-trigger.service.in delete mode 100644 units/udev.service.in (limited to 'units') diff --git a/units/.gitignore b/units/.gitignore index 3cf64237a8..eda676a480 100644 --- a/units/.gitignore +++ b/units/.gitignore @@ -41,6 +41,6 @@ systemd-update-utmp-shutdown.service test-env-replace systemd-binfmt.service emergency.service -/udev-settle.service -/udev-trigger.service -/udev.service +/systemd-udev-settle.service +/systemd-udev-trigger.service +/systemd-udev.service diff --git a/units/systemd-udev-control.socket b/units/systemd-udev-control.socket new file mode 100644 index 0000000000..f80f774427 --- /dev/null +++ b/units/systemd-udev-control.socket @@ -0,0 +1,10 @@ +[Unit] +Description=udev Control Socket +DefaultDependencies=no +ConditionCapability=CAP_MKNOD + +[Socket] +Service=udev.service +ListenSequentialPacket=/run/udev/control +SocketMode=0600 +PassCredentials=yes diff --git a/units/systemd-udev-kernel.socket b/units/systemd-udev-kernel.socket new file mode 100644 index 0000000000..23fa9d5e11 --- /dev/null +++ b/units/systemd-udev-kernel.socket @@ -0,0 +1,10 @@ +[Unit] +Description=udev Kernel Socket +DefaultDependencies=no +ConditionCapability=CAP_MKNOD + +[Socket] +Service=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 new file mode 100644 index 0000000000..0a5e8c51ff --- /dev/null +++ b/units/systemd-udev-settle.service.in @@ -0,0 +1,26 @@ +# This service is usually not enabled by default. If enabled, it +# acts as a barrier for basic.target -- so all later services will +# wait for udev completely finishing its coldplug run. +# +# If needed, to work around broken or non-hotplug-aware services, +# it might be enabled unconditionally, or pulled-in on-demand by +# the services that assume a fully populated /dev at startup. It +# should not be used or pulled-in ever on systems without such +# legacy services running. + +[Unit] +Description=udev Wait for Complete Device Initialization +DefaultDependencies=no +Wants=udev.service +After=udev-trigger.service +Before=basic.target +ConditionCapability=CAP_MKNOD + +[Service] +Type=oneshot +TimeoutSec=180 +RemainAfterExit=yes +ExecStart=@bindir@/udevadm settle + +[Install] +WantedBy=basic.target diff --git a/units/systemd-udev-trigger.service.in b/units/systemd-udev-trigger.service.in new file mode 100644 index 0000000000..ce937ae899 --- /dev/null +++ b/units/systemd-udev-trigger.service.in @@ -0,0 +1,11 @@ +[Unit] +Description=udev Coldplug all Devices +Wants=udev.service +After=udev-kernel.socket udev-control.socket +DefaultDependencies=no +ConditionCapability=CAP_MKNOD + +[Service] +Type=oneshot +RemainAfterExit=yes +ExecStart=@bindir@/udevadm trigger --type=subsystems --action=add ; @bindir@/udevadm trigger --type=devices --action=add diff --git a/units/systemd-udev.service.in b/units/systemd-udev.service.in new file mode 100644 index 0000000000..60d8601217 --- /dev/null +++ b/units/systemd-udev.service.in @@ -0,0 +1,14 @@ +[Unit] +Description=udev Kernel Device Manager +Wants=udev-control.socket udev-kernel.socket +After=udev-control.socket 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=on-failure +ExecStart=@rootlibexecdir@/systemd-udevd diff --git a/units/udev-control.socket b/units/udev-control.socket deleted file mode 100644 index f80f774427..0000000000 --- a/units/udev-control.socket +++ /dev/null @@ -1,10 +0,0 @@ -[Unit] -Description=udev Control Socket -DefaultDependencies=no -ConditionCapability=CAP_MKNOD - -[Socket] -Service=udev.service -ListenSequentialPacket=/run/udev/control -SocketMode=0600 -PassCredentials=yes diff --git a/units/udev-kernel.socket b/units/udev-kernel.socket deleted file mode 100644 index 23fa9d5e11..0000000000 --- a/units/udev-kernel.socket +++ /dev/null @@ -1,10 +0,0 @@ -[Unit] -Description=udev Kernel Socket -DefaultDependencies=no -ConditionCapability=CAP_MKNOD - -[Socket] -Service=udev.service -ReceiveBuffer=134217728 -ListenNetlink=kobject-uevent 1 -PassCredentials=yes diff --git a/units/udev-settle.service.in b/units/udev-settle.service.in deleted file mode 100644 index 0a5e8c51ff..0000000000 --- a/units/udev-settle.service.in +++ /dev/null @@ -1,26 +0,0 @@ -# This service is usually not enabled by default. If enabled, it -# acts as a barrier for basic.target -- so all later services will -# wait for udev completely finishing its coldplug run. -# -# If needed, to work around broken or non-hotplug-aware services, -# it might be enabled unconditionally, or pulled-in on-demand by -# the services that assume a fully populated /dev at startup. It -# should not be used or pulled-in ever on systems without such -# legacy services running. - -[Unit] -Description=udev Wait for Complete Device Initialization -DefaultDependencies=no -Wants=udev.service -After=udev-trigger.service -Before=basic.target -ConditionCapability=CAP_MKNOD - -[Service] -Type=oneshot -TimeoutSec=180 -RemainAfterExit=yes -ExecStart=@bindir@/udevadm settle - -[Install] -WantedBy=basic.target diff --git a/units/udev-trigger.service.in b/units/udev-trigger.service.in deleted file mode 100644 index ce937ae899..0000000000 --- a/units/udev-trigger.service.in +++ /dev/null @@ -1,11 +0,0 @@ -[Unit] -Description=udev Coldplug all Devices -Wants=udev.service -After=udev-kernel.socket udev-control.socket -DefaultDependencies=no -ConditionCapability=CAP_MKNOD - -[Service] -Type=oneshot -RemainAfterExit=yes -ExecStart=@bindir@/udevadm trigger --type=subsystems --action=add ; @bindir@/udevadm trigger --type=devices --action=add diff --git a/units/udev.service.in b/units/udev.service.in deleted file mode 100644 index 7336e0eec7..0000000000 --- a/units/udev.service.in +++ /dev/null @@ -1,14 +0,0 @@ -[Unit] -Description=udev Kernel Device Manager -Wants=udev-control.socket udev-kernel.socket -After=udev-control.socket udev-kernel.socket -Before=basic.target -DefaultDependencies=no -ConditionCapability=CAP_MKNOD - -[Service] -Type=notify -OOMScoreAdjust=-1000 -Sockets=udev-control.socket udev-kernel.socket -Restart=on-failure -ExecStart=@udevlibexecdir@/udevd -- cgit v1.2.3-54-g00ecf