From 25cabb341d08307f5337e47e7847cdd745e20ebd Mon Sep 17 00:00:00 2001
From: Stefan Saraev <stefan@saraev.ca>
Date: Thu, 17 Jan 2013 21:42:08 +0200
Subject: [PATCH 1/6] Revert "Consolekit: sync & unmountall before reboot /
 shutdown"

This reverts commit f79168770fefa9754f01dd8a582732d8ae70e6e6.
---
 packages/sysutils/ConsoleKit/scripts/ck-system-restart | 2 --
 packages/sysutils/ConsoleKit/scripts/ck-system-stop    | 2 --
 2 files changed, 4 deletions(-)

diff --git a/packages/sysutils/ConsoleKit/scripts/ck-system-restart b/packages/sysutils/ConsoleKit/scripts/ck-system-restart
index 99bb297019..f1485b1b63 100755
--- a/packages/sysutils/ConsoleKit/scripts/ck-system-restart
+++ b/packages/sysutils/ConsoleKit/scripts/ck-system-restart
@@ -31,6 +31,4 @@ for seq in `seq 1 10` ; do
   clear > /dev/tty1
   killall5 -18 || break
 done
-sync
-umount -a >/dev/null 2>&1
 reboot
diff --git a/packages/sysutils/ConsoleKit/scripts/ck-system-stop b/packages/sysutils/ConsoleKit/scripts/ck-system-stop
index 0073acaa7c..3ee00bb06d 100755
--- a/packages/sysutils/ConsoleKit/scripts/ck-system-stop
+++ b/packages/sysutils/ConsoleKit/scripts/ck-system-stop
@@ -31,6 +31,4 @@ for seq in `seq 1 10` ; do
   clear > /dev/tty1
   killall5 -18 || break
 done
-sync
-umount -a >/dev/null 2>&1
 poweroff

From ed09245f29a6beaca839b9f9780ed06873d7210a Mon Sep 17 00:00:00 2001
From: Stefan Saraev <stefan@saraev.ca>
Date: Thu, 17 Jan 2013 21:42:31 +0200
Subject: [PATCH 2/6] Revert "Consolekit: implement *safe* shutdown / reboot"

This reverts commit 7a1055769fbe3eae024b61c11b1192104724b425.
---
 packages/sysutils/ConsoleKit/scripts/ck-system-restart | 6 ------
 packages/sysutils/ConsoleKit/scripts/ck-system-stop    | 6 ------
 2 files changed, 12 deletions(-)

diff --git a/packages/sysutils/ConsoleKit/scripts/ck-system-restart b/packages/sysutils/ConsoleKit/scripts/ck-system-restart
index f1485b1b63..8bf92d5d12 100755
--- a/packages/sysutils/ConsoleKit/scripts/ck-system-restart
+++ b/packages/sysutils/ConsoleKit/scripts/ck-system-restart
@@ -25,10 +25,4 @@ 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
 reboot
diff --git a/packages/sysutils/ConsoleKit/scripts/ck-system-stop b/packages/sysutils/ConsoleKit/scripts/ck-system-stop
index 3ee00bb06d..75700497ca 100755
--- a/packages/sysutils/ConsoleKit/scripts/ck-system-stop
+++ b/packages/sysutils/ConsoleKit/scripts/ck-system-stop
@@ -25,10 +25,4 @@ 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
 poweroff

From 84faae5a0aef195afcb9a2fd89fd4d78c5223fa0 Mon Sep 17 00:00:00 2001
From: Stefan Saraev <stefan@saraev.ca>
Date: Thu, 17 Jan 2013 21:46:22 +0200
Subject: [PATCH 3/6] busybox: re-add 'safe shutdown / reboot'

---
 .../busybox/profile.d/safe-shutdown.conf      | 41 +++++++++++++++++++
 1 file changed, 41 insertions(+)
 create mode 100644 packages/sysutils/busybox/profile.d/safe-shutdown.conf

diff --git a/packages/sysutils/busybox/profile.d/safe-shutdown.conf b/packages/sysutils/busybox/profile.d/safe-shutdown.conf
new file mode 100644
index 0000000000..69710d03a5
--- /dev/null
+++ b/packages/sysutils/busybox/profile.d/safe-shutdown.conf
@@ -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
+  }

From ae9a91b3d482eb7ae112f4f5c0a5e7576ca71949 Mon Sep 17 00:00:00 2001
From: Stefan Saraev <stefan@saraev.ca>
Date: Thu, 17 Jan 2013 21:48:28 +0200
Subject: [PATCH 4/6] ConsoleKit: re-add 'safe shutdown / reboot'

---
 packages/sysutils/ConsoleKit/scripts/ck-system-restart | 3 +++
 packages/sysutils/ConsoleKit/scripts/ck-system-stop    | 3 +++
 2 files changed, 6 insertions(+)

diff --git a/packages/sysutils/ConsoleKit/scripts/ck-system-restart b/packages/sysutils/ConsoleKit/scripts/ck-system-restart
index 8bf92d5d12..ff2001be08 100755
--- a/packages/sysutils/ConsoleKit/scripts/ck-system-restart
+++ b/packages/sysutils/ConsoleKit/scripts/ck-system-restart
@@ -20,9 +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
+_safe_shutdown
 reboot
diff --git a/packages/sysutils/ConsoleKit/scripts/ck-system-stop b/packages/sysutils/ConsoleKit/scripts/ck-system-stop
index 75700497ca..d729536d6c 100755
--- a/packages/sysutils/ConsoleKit/scripts/ck-system-stop
+++ b/packages/sysutils/ConsoleKit/scripts/ck-system-stop
@@ -20,9 +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
+_safe_shutdown
 poweroff

From 21a93be4d35e5116070a7b8d88902a6ec91c1288 Mon Sep 17 00:00:00 2001
From: Stefan Saraev <stefan@saraev.ca>
Date: Thu, 17 Jan 2013 21:54:49 +0200
Subject: [PATCH 5/6] xbmc: init: add 'safe shutdown / reboot'. we need this
 for RPi

---
 packages/mediacenter/xbmc/init.d/93_xbmc | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/packages/mediacenter/xbmc/init.d/93_xbmc b/packages/mediacenter/xbmc/init.d/93_xbmc
index 164310c603..df8f7d9d05 100644
--- a/packages/mediacenter/xbmc/init.d/93_xbmc
+++ b/packages/mediacenter/xbmc/init.d/93_xbmc
@@ -78,18 +78,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
         ;;

From 6e5d304a3f63280bdfccad3b994b91a1fff0972b Mon Sep 17 00:00:00 2001
From: Stephan Raue <stephan@openelec.tv>
Date: Thu, 17 Jan 2013 22:05:20 +0100
Subject: [PATCH 6/6] bluez: add init script and udev rule (needs rework)

Signed-off-by: Stephan Raue <stephan@openelec.tv>
---
 packages/network/bluez/init.d/22_bluez        | 27 +++++++++++++++++++
 .../network/bluez/udev.d/09-bluetooth.rules   |  6 +++++
 2 files changed, 33 insertions(+)
 create mode 100644 packages/network/bluez/init.d/22_bluez
 create mode 100644 packages/network/bluez/udev.d/09-bluetooth.rules

diff --git a/packages/network/bluez/init.d/22_bluez b/packages/network/bluez/init.d/22_bluez
new file mode 100644
index 0000000000..92aa14170a
--- /dev/null
+++ b/packages/network/bluez/init.d/22_bluez
@@ -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 &
diff --git a/packages/network/bluez/udev.d/09-bluetooth.rules b/packages/network/bluez/udev.d/09-bluetooth.rules
new file mode 100644
index 0000000000..7aa0a38d29
--- /dev/null
+++ b/packages/network/bluez/udev.d/09-bluetooth.rules
@@ -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"