mirror of
https://github.com/LibreELEC/LibreELEC.tv.git
synced 2025-07-28 13:16:41 +00:00
boblightd: rework start/stop/suspend. prepare for systemd
This commit is contained in:
parent
3c8da986e3
commit
6bf21a6fcd
@ -39,23 +39,25 @@ BOBLIGHT_X11="$ADDON_HOME/boblight.X11"
|
|||||||
|
|
||||||
LOCKDIR="/var/lock/"
|
LOCKDIR="/var/lock/"
|
||||||
LOCKFILE="boblightd.disabled"
|
LOCKFILE="boblightd.disabled"
|
||||||
|
LOCKFILE_SLEEP="boblightd.sleep"
|
||||||
|
|
||||||
export LD_LIBRARY_PATH="$ADDON_DIR/lib:$LD_LIBRARY_PATH"
|
export LD_LIBRARY_PATH="$ADDON_DIR/lib:$LD_LIBRARY_PATH"
|
||||||
|
|
||||||
cp -R $ADDON_DIR/config/*.sample $ADDON_HOME > $LOG_FILE 2>&1
|
cp -R $ADDON_DIR/config/*.sample $ADDON_HOME > $LOG_FILE 2>&1
|
||||||
|
|
||||||
if [ -f "$LOCKDIR/$LOCKFILE" ] ; then
|
rm -rf "$LOCKDIR/$LOCKFILE_SLEEP" &>/dev/null
|
||||||
rm -rf "$LOCKDIR/$LOCKFILE"
|
boblightd.stop
|
||||||
fi
|
rm -rf "$LOCKDIR/$LOCKFILE" &>/dev/null
|
||||||
|
|
||||||
if [ -f "$BOBLIGHT_CONFIG" ] ; then
|
if [ -f "$BOBLIGHT_CONFIG" ] ; then
|
||||||
if [ ! "$(pidof boblightd)" ]; then
|
if [ ! "$(pidof boblightd)" ]; then
|
||||||
while [ true ] ; do
|
while [ true ] ; do
|
||||||
|
while [ -f "$LOCKDIR/$LOCKFILE_SLEEP" ] ; do
|
||||||
|
usleep 100000
|
||||||
|
done
|
||||||
if [ -f "$LOCKDIR/$LOCKFILE" ] ; then
|
if [ -f "$LOCKDIR/$LOCKFILE" ] ; then
|
||||||
break
|
break
|
||||||
fi
|
fi
|
||||||
# Make sure the xserver has started up
|
|
||||||
wait_for_xorg
|
|
||||||
# Start the boblight daemon
|
# Start the boblight daemon
|
||||||
boblightd -c $BOBLIGHT_CONFIG >> $LOG_FILE 2>&1
|
boblightd -c $BOBLIGHT_CONFIG >> $LOG_FILE 2>&1
|
||||||
done &
|
done &
|
||||||
@ -64,11 +66,12 @@ if [ -f "$BOBLIGHT_CONFIG" ] ; then
|
|||||||
if [ -e $BOBLIGHT_X11 ]; then
|
if [ -e $BOBLIGHT_X11 ]; then
|
||||||
if [ ! "$(pidof boblight-X11)" ]; then
|
if [ ! "$(pidof boblight-X11)" ]; then
|
||||||
while [ true ] ; do
|
while [ true ] ; do
|
||||||
|
while [ -f "$LOCKDIR/$LOCKFILE_SLEEP" ] ; do
|
||||||
|
usleep 100000
|
||||||
|
done
|
||||||
if [ -f "$LOCKDIR/$LOCKFILE" ] ; then
|
if [ -f "$LOCKDIR/$LOCKFILE" ] ; then
|
||||||
break
|
break
|
||||||
fi
|
fi
|
||||||
# Make sure the xserver has started up
|
|
||||||
wait_for_xorg
|
|
||||||
# Start the boblight daemon
|
# Start the boblight daemon
|
||||||
boblight-X11 >> $LOG_FILE 2>&1
|
boblight-X11 >> $LOG_FILE 2>&1
|
||||||
done &
|
done &
|
||||||
|
@ -24,14 +24,22 @@
|
|||||||
|
|
||||||
LOCKDIR="/var/lock/"
|
LOCKDIR="/var/lock/"
|
||||||
LOCKFILE="boblightd.disabled"
|
LOCKFILE="boblightd.disabled"
|
||||||
|
LOCKFILE_SLEEP="boblightd.sleep"
|
||||||
|
|
||||||
mkdir -p "$LOCKDIR"
|
mkdir -p "$LOCKDIR"
|
||||||
touch "$LOCKDIR/$LOCKFILE"
|
if [ ! -e "$LOCKDIR/$LOCKFILE_SLEEP" ] ; then
|
||||||
|
touch "$LOCKDIR/$LOCKFILE"
|
||||||
if [ "$(pidof boblightd)" ];then
|
|
||||||
killall boblightd
|
|
||||||
fi
|
fi
|
||||||
|
|
||||||
if [ "$(pidof boblight-X11)" ];then
|
if [ "$(pidof boblightd)" ] ; then
|
||||||
killall boblight-X11
|
killall -q boblightd
|
||||||
|
killall -q boblight-X11
|
||||||
|
for seq in `seq 1 10` ; do
|
||||||
|
if [ ! "$(pidof boblightd boblight-X11)" ] ; then
|
||||||
|
break
|
||||||
|
fi
|
||||||
|
usleep 200000
|
||||||
|
done
|
||||||
|
killall -q -9 boblightd
|
||||||
|
killall -q -9 boblight-X11
|
||||||
fi
|
fi
|
||||||
|
@ -22,19 +22,18 @@
|
|||||||
|
|
||||||
. /etc/profile
|
. /etc/profile
|
||||||
|
|
||||||
LOCKFILE="/var/lock/boblightd.sleep"
|
LOCKFILE_SLEEP="/var/lock/boblightd.sleep"
|
||||||
|
|
||||||
case "$1" in
|
case "$1" in
|
||||||
hibernate|suspend)
|
hibernate|suspend|pre)
|
||||||
progress "Shutting down boblightd for suspending..."
|
progress "Shutting down boblightd for suspending..."
|
||||||
|
touch $LOCKFILE_SLEEP
|
||||||
boblightd.stop
|
boblightd.stop
|
||||||
touch $LOCKFILE
|
|
||||||
;;
|
;;
|
||||||
thaw|resume)
|
thaw|resume|post)
|
||||||
progress "Restarting boblightd for wakeup..."
|
if [ -f "$LOCKFILE_SLEEP" ] ; then
|
||||||
if [ -f "$LOCKFILE" ] ; then
|
progress "Restarting boblightd for wakeup..."
|
||||||
rm -rf "$LOCKFILE"
|
rm -rf "$LOCKFILE_SLEEP"
|
||||||
boblightd.start
|
|
||||||
fi
|
fi
|
||||||
;;
|
;;
|
||||||
*) exit $NA
|
*) exit $NA
|
||||||
|
Loading…
x
Reference in New Issue
Block a user