projects
/
hvlinux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Convert BUGS file to UTF-8
[hvlinux.git]
/
stage4
/
bootscripts
/
dbus
diff --git
a/stage4/bootscripts/dbus
b/stage4/bootscripts/dbus
index
fe6987f
..
0efaa69
100755
(executable)
--- a/
stage4/bootscripts/dbus
+++ b/
stage4/bootscripts/dbus
@@
-7,8
+7,12
@@
source /etc/rc.d/init.d/functions
log_script_name "$0 $*"
log_script_name "$0 $*"
+DAEMON=/usr/bin/dbus-daemon
+DAEMON_DESC="D-BUS Messagebus daemon"
+DAEMON_OPTS="--config-file=/etc/dbus-1/system.conf"
+
dbus_start() {
dbus_start() {
- if statusproc
dbus-daemon
| grep -q "not running"; then
+ if statusproc
${DAEMON}
| grep -q "not running"; then
if [ -f /var/run/dbus/pid ]; then
rm /var/run/dbus/pid
fi
if [ -f /var/run/dbus/pid ]; then
rm /var/run/dbus/pid
fi
@@
-19,8
+23,8
@@
dbus_start() {
echo "Already running..."
return ${EXIT_CODE_WARNING}
fi
echo "Already running..."
return ${EXIT_CODE_WARNING}
fi
-
- loadproc
/usr/bin/dbus-daemon --config-file=/etc/dbus-1/system.conf
+
+ loadproc
${DAEMON} ${DAEMON_OPTS}
return $?
}
return $?
}
@@
-28,19
+32,19
@@
dbus_start() {
case "$1" in
start)
case "$1" in
start)
- cmd_run_log_box_warn "
D-Bus Messagebus Daemon
start" dbus_start
+ cmd_run_log_box_warn "
${DAEMON_DESC}
start" dbus_start
;;
stop)
;;
stop)
- cmd_run_log_box_warn "
D-Bus Messagebus Daemon stop" killproc dbus-daemon
&&
+ cmd_run_log_box_warn "
${DAEMON_DESC} stop" killproc ${DAEMON}
&&
rm /var/run/dbus/pid &&
rm /var/run/dbus/system_bus_socket
;;
rm /var/run/dbus/pid &&
rm /var/run/dbus/system_bus_socket
;;
-
+
status)
status)
- statusproc
dbus-daemon
+ statusproc
${DAEMON}
;;
;;
-
+
restart)
$0 stop
sleep 1
restart)
$0 stop
sleep 1