summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorWilliam Hubbs <williamh@gentoo.org>2011-08-03 15:17:44 -0500
committerWilliam Hubbs <williamh@gentoo.org>2011-08-03 15:17:44 -0500
commitc322c9fb2fa5baf5706dfd771a41b6868b0e047a (patch)
tree688d25d94299e86bc608577cdfa01749a9551a29
parentMove debug and event logs (diff)
downloadudev-gentoo-scripts-c322c9fb2fa5baf5706dfd771a41b6868b0e047a.tar.gz
udev-gentoo-scripts-c322c9fb2fa5baf5706dfd771a41b6868b0e047a.tar.bz2
udev-gentoo-scripts-c322c9fb2fa5baf5706dfd771a41b6868b0e047a.zip
Revert "Move debug and event logs"
This reverts commit 9177f931b926e4b1377b51f19cbbae94a421fc03. This can't happen because root is read only when udev is started.
-rw-r--r--conf.d/udev4
-rw-r--r--init.d/udev6
2 files changed, 5 insertions, 5 deletions
diff --git a/conf.d/udev b/conf.d/udev
index f41ff01..da113a8 100644
--- a/conf.d/udev
+++ b/conf.d/udev
@@ -38,12 +38,12 @@ persistent_cd_disable="no"
# udevd --help for possible values
#udev_opts=""
-# Run udevd --debug and write output to /tmp/udev.log
+# Run udevd --debug and write output to $RUNDIR/udev.log
# Should not be kept on as it fills diskspace slowly
#udev_debug="YES"
# Run udevadmin monitor to get a log of all events
-# in /tmp/udevmonitor.log
+# in $RUNDIR/udevmonitor.log
#udev_monitor="YES"
# Keep udevmonitor running after populating /dev.
diff --git a/init.d/udev b/init.d/udev
index a565ac0..9e6e2e7 100644
--- a/init.d/udev
+++ b/init.d/udev
@@ -103,7 +103,7 @@ start_udevd()
ebegin "Starting udevd"
if yesno "${udev_debug}"; then
- /sbin/udevd --daemon ${opts} --debug 2>/tmp/udev.log
+ /sbin/udevd --daemon ${opts} --debug 2>"$(get_rundir)"/udev.log
else
start-stop-daemon --start --exec /sbin/udevd -- --daemon ${opts}
fi
@@ -146,10 +146,10 @@ start_udevmonitor()
{
yesno "${udev_monitor}" || return 0
- udevmonitor_log=/tmp/udevmonitor.log
+ udevmonitor_log="$(get_rundir)/udevmonitor.log"
udevmonitor_pid="$(get_rundir)/udevmonitor.pid"
- einfo "udev: Running udevadm monitor ${udev_monitor_opts} to log all events"
+ einfo "udev: Running udevadm monitor ${udev_monitor_opts} to get a log of all events"
start-stop-daemon --start --stdout "${udevmonitor_log}" \
--make-pidfile --pidfile "${udevmonitor_pid}" \
--background --exec /sbin/udevadm -- monitor ${udev_monitor_opts}