summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorWilliam Hubbs <williamh@gentoo.org>2019-02-20 10:53:59 -0600
committerWilliam Hubbs <williamh@gentoo.org>2019-02-20 11:07:30 -0600
commit6f98cf89f54a9ad1c9625577d100f6ca8b8a2b0b (patch)
tree1946c5afb95cc923ab510c27c7f6287b4d8c22c6
parentversion 33 (diff)
downloadudev-gentoo-scripts-6f98cf89f54a9ad1c9625577d100f6ca8b8a2b0b.tar.gz
udev-gentoo-scripts-6f98cf89f54a9ad1c9625577d100f6ca8b8a2b0b.tar.bz2
udev-gentoo-scripts-6f98cf89f54a9ad1c9625577d100f6ca8b8a2b0b.zip
Do not use the --daemon option in the udev service scriptHEAD33master
Using this option does not allow OpenRC to show the status correctly since udevd doesn't write a pid file. We need to create the pidfile ourselves. Signed-off-by: William Hubbs <williamh@gentoo.org>
-rw-r--r--init.d/udev8
1 files changed, 5 insertions, 3 deletions
diff --git a/init.d/udev b/init.d/udev
index 6ff21b2..d0f9d61 100644
--- a/init.d/udev
+++ b/init.d/udev
@@ -2,7 +2,9 @@
# Copyright 1999-2013 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-command_args="--daemon ${udev_opts}"
+command_args="${udev_opts}"
+command_background=yes
+pidfile=/run/udev.pid
description="udev manages device permissions and symbolic links in /dev"
extra_started_commands="reload"
description_reload="Reload the udev rules and databases"
@@ -79,11 +81,11 @@ stop()
rc=$?
if [ $rc -ne 0 ]; then
eend $rc "Failed to stop $RC_SVCNAME using udevadm"
- get_udevd_binary || return 1
ebegin "Trying with start-stop-daemon"
- start-stop-daemon --stop --exec ${command}
+ start-stop-daemon --stop --pidfile "${pidfile}"
rc=$?
fi
+ [ $rc -eq 0 ] && rm -f "${pidfile}"
eend $rc "Failed to stop $RC_SVCNAME"
}