commit af64b40b0012e7fae7e9a61b50d55cf1d2c77592
Author: Elan Ruusamäe <[email protected]>
Date: Sat Feb 16 20:53:15 2013 +0200
unify initscripts
lircd.init | 72 ++++++++++++++++++++++++++++++++++---------------------------
lircmd.init | 54 ++++++++++++++++++++++++++--------------------
2 files changed, 71 insertions(+), 55 deletions(-)
---
diff --git a/lircd.init b/lircd.init
old mode 100644
new mode 100755
index b7b9cd3..d7b715d
--- a/lircd.init
+++ b/lircd.init
@@ -20,35 +20,37 @@
start() {
# Check if the service is already running?
- if [ ! -f /var/lock/subsys/lircd ]; then
- msg_starting "Linux Infrared Remote Control daemon"
- OPTIONS=""
- [ -n "$DRIVER" ] && OPTIONS="--driver=$DRIVER"
- [ -n "$DEVICE" ] && OPTIONS="$OPTIONS --device=$DEVICE"
- #Check if use serial port
- [ -n "$COM_PORT" ] && setserial $COM_PORT uart none
- MODULE_OPTIONS=""
- [ -n "$DRIVER_OPTS" ] && MODULE_OPTIONS="$DRIVER_OPTS"
- modprobe -s lirc $MODULE_OPTIONS > /dev/null 2>&1
- ln -sf /tmp/.lircd /dev/lircd
- daemon lircd $OPTIONS
- RETVAL=$?
- [ $RETVAL -eq 0 ] && touch /var/lock/subsys/lircd
- else
+ if [ -f /var/lock/subsys/lircd ]; then
msg_already_running "Linux Infrared Remote Control daemon"
+ return
fi
+
+ msg_starting "Linux Infrared Remote Control daemon"
+ OPTIONS=""
+ [ -n "$DRIVER" ] && OPTIONS="--driver=$DRIVER"
+ [ -n "$DEVICE" ] && OPTIONS="$OPTIONS --device=$DEVICE"
+ #Check if use serial port
+ [ -n "$COM_PORT" ] && setserial $COM_PORT uart none
+ MODULE_OPTIONS=""
+ [ -n "$DRIVER_OPTS" ] && MODULE_OPTIONS="$DRIVER_OPTS"
+ modprobe -s lirc $MODULE_OPTIONS > /dev/null 2>&1
+ ln -sf /tmp/.lircd /dev/lircd
+ daemon lircd $OPTIONS
+ RETVAL=$?
+ [ $RETVAL -eq 0 ] && touch /var/lock/subsys/lircd
}
stop() {
# Stop daemons.
- if [ -f /var/lock/subsys/lircd ]; then
- msg_stopping "Linux Infrared Remote Control daemon"
- killproc lircd
- rm -f /dev/lircd
- rm -f /var/lock/subsys/lircd >/dev/null 2>&1
- else
+ if [ ! -f /var/lock/subsys/lircd ]; then
msg_not_running "Linux Infrared Remote Control daemon"
+ return
fi
+
+ msg_stopping "Linux Infrared Remote Control daemon"
+ killproc lircd
+ rm -f /dev/lircd
+ rm -f /var/lock/subsys/lircd >/dev/null 2>&1
}
restart() {
@@ -60,12 +62,25 @@ restart() {
}
condrestart() {
- if [ -f /var/lock/subsys/lircd ]; then
- restart
- else
+ if [ ! -f /var/lock/subsys/lircd ]; then
msg_not_running "Linux Infrared Remote Control daemon"
RETVAL=$1
+ return
fi
+
+ restart
+}
+
+reload() {
+ if [ ! -f /var/lock/subsys/lircd ]; then
+ msg_not_running "Linux Infrared Remote Control daemon"
+ RETVAL=7
+ return
+ fi
+
+ msg_reloading "Linux Infrared Remote Control daemon"
+ killproc lircd -HUP
+ RETVAL=$?
}
RETVAL=0
@@ -84,14 +99,7 @@ case "$1" in
condrestart 0
;;
reload|force-reload)
- if [ -f /var/lock/subsys/lircd ]; then
- msg_reloading "Linux Infrared Remote Control daemon"
- killproc lircd -HUP
- RETVAL=$?
- else
- msg_not_running "Linux Infrared Remote Control daemon"
- exit 7
- fi
+ reload
;;
status)
status lircd
diff --git a/lircmd.init b/lircmd.init
old mode 100644
new mode 100755
index 0ef6044..138a66b
--- a/lircmd.init
+++ b/lircmd.init
@@ -15,34 +15,49 @@
. /etc/rc.d/init.d/functions
start() {
- if [ ! -f /var/lock/subsys/lircmd ]; then
- msg_starting "Linux Infrared Remote Control mouse daemon"
- daemon lircmd
- RETVAL=$?
- [ $RETVAL -eq 0 ] && touch /var/lock/subsys/lircmd
- else
+ if [ -f /var/lock/subsys/lircmd ]; then
msg_already_running "Linux Infrared Remote Control mouse daemon"
+ return
fi
+
+ msg_starting "Linux Infrared Remote Control mouse daemon"
+ daemon lircmd
+ RETVAL=$?
+ [ $RETVAL -eq 0 ] && touch /var/lock/subsys/lircmd
}
stop() {
- if [ -f /var/lock/subsys/lircmd ]; then
- msg_stopping "Linux Infrared Remote Control mouse daemon"
- killproc lircmd
- rm -f /var/lock/subsys/lircmd >/dev/null 2>&1
- else
+ if [ ! -f /var/lock/subsys/lircmd ]; then
msg_not_running "Linux Infrared Remote Control mouse daemon"
+ return
fi
+
+ msg_stopping "Linux Infrared Remote Control mouse daemon"
+ killproc lircmd
+ rm -f /var/lock/subsys/lircmd >/dev/null 2>&1
}
condrestart() {
- if [ -f /var/lock/subsys/lircmd ]; then
- stop
- start
- else
+ if [ ! -f /var/lock/subsys/lircmd ]; then
msg_not_running "Linux Infrared Remote Control mouse daemon"
RETVAL=$1
+ return
fi
+
+ stop
+ start
+}
+
+reload() {
+ if [ ! -f /var/lock/subsys/lircmd ]; then
+ msg_not_running "Linux Infrared Remote Control mouse daemon"
+ RETVAL=7
+ return
+ fi
+
+ msg_reloading "Linux Infrared Remote Control mouse daemon"
+ killproc lircmd -HUP
+ RETVAL=$?
}
RETVAL=0
@@ -62,14 +77,7 @@ case "$1" in
condrestart 0
;;
reload|force-reload)
- if [ -f /var/lock/subsys/lircmd ]; then
- msg_reloading "Linux Infrared Remote Control mouse daemon"
- killproc lircmd -HUP
- RETVAL=$?
- else
- msg_not_running "Linux Infrared Remote Control mouse daemon" >&2
- exit 7
- fi
+ reload
;;
status)
status lircmd
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/lirc.git/commitdiff/af64b40b0012e7fae7e9a61b50d55cf1d2c77592
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
