Merge branch 'openelec-next' of github.com:OpenELEC/OpenELEC.tv into openelec-settings

This commit is contained in:
Stephan Raue 2013-01-17 22:14:31 +01:00
commit 812794e57f
6 changed files with 83 additions and 16 deletions

View File

@ -72,18 +72,21 @@ fi
0)
if [ ! $(pidof console-kit-daemon) ]; then
touch "$LOCKDIR/$LOCKFILE"
_safe_shutdown
poweroff -f
fi
;;
64)
if [ ! $(pidof console-kit-daemon) ]; then
touch "$LOCKDIR/$LOCKFILE"
_safe_shutdown
poweroff -f
fi
;;
66)
if [ ! $(pidof console-kit-daemon) ]; then
touch "$LOCKDIR/$LOCKFILE"
_safe_shutdown
reboot
fi
;;

View File

@ -0,0 +1,27 @@
################################################################################
# Copyright (C) 2009-2010 OpenELEC.tv
# http://www.openelec.tv
#
# This Program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
# the Free Software Foundation; either version 2, or (at your option)
# any later version.
#
# This Program is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
# along with OpenELEC.tv; see the file COPYING. If not, write to
# the Free Software Foundation, 51 Franklin Street, Suite 500, Boston, MA 02110, USA.
# http://www.gnu.org/copyleft/gpl.html
################################################################################
# starting Bluetooth
#
# runlevels: openelec, textmode
# starting Bluetooth manager
progress "starting Bluetooth manager"
/usr/lib/bluetooth/bluetoothd > /dev/null 2>&1 &

View File

@ -0,0 +1,6 @@
ACTION!="add|change", GOTO="end"
KERNEL=="hci[0-9]*", SUBSYSTEM=="bluetooth", RUN+="/usr/bin/hciconfig %k up"
KERNEL=="hci[0-9]*", SUBSYSTEM=="bluetooth", RUN+="/usr/bin/hciconfig %k lm master"
LABEL="end"

View File

@ -20,17 +20,12 @@
# http://www.gnu.org/copyleft/gpl.html
################################################################################
. /etc/profile.d/safe-shutdown.conf
LOCKDIR="/var/lock/"
LOCKFILE="xbmc.disabled"
touch "$LOCKDIR/$LOCKFILE"
wait_on_xbmc_exit
killall sshd
killall5 -15
for seq in `seq 1 10` ; do
usleep 500000
clear > /dev/tty1
killall5 -18 || break
done
sync
umount -a >/dev/null 2>&1
_safe_shutdown
reboot

View File

@ -20,17 +20,12 @@
# http://www.gnu.org/copyleft/gpl.html
################################################################################
. /etc/profile.d/safe-shutdown.conf
LOCKDIR="/var/lock/"
LOCKFILE="xbmc.disabled"
touch "$LOCKDIR/$LOCKFILE"
wait_on_xbmc_exit
killall sshd
killall5 -15
for seq in `seq 1 10` ; do
usleep 500000
clear > /dev/tty1
killall5 -18 || break
done
sync
umount -a >/dev/null 2>&1
_safe_shutdown
poweroff

View File

@ -0,0 +1,41 @@
################################################################################
# This file is part of OpenELEC - http://www.openelec.tv
# Copyright (C) 2009-2012 Stephan Raue (stephan@openelec.tv)
#
# This Program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
# the Free Software Foundation; either version 2, or (at your option)
# any later version.
#
# This Program is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
# along with OpenELEC.tv; see the file COPYING. If not, write to
# the Free Software Foundation, 51 Franklin Street, Suite 500, Boston, MA 02110, USA.
# http://www.gnu.org/copyleft/gpl.html
################################################################################
# Core (PATH) environment variables.
#
# This file contains non-OpenELEC evironment variables as well as OpenELEC
# evironment variables that are not user defined.
################################################################################
add_omit_pids() {
omit_pids+=( $@ )
}
_safe_shutdown () {
add_omit_pids $(pidof connmand)
add_omit_pids $(pidof dbus-daemon)
killall5 -15 ${omit_pids[@]/#/-o }
for seq in `seq 1 10` ; do
usleep 500000
clear > /dev/tty1
killall5 -18 ${omit_pids[@]/#/-o } || break
done
sync
umount -a >/dev/null 2>&1
}