From 1db4efb7de9f92bc786cf528ab0843aea2509bb3 Mon Sep 17 00:00:00 2001
From: Stephan Raue <stephan@x200t.openelec.tv>
Date: Mon, 1 Mar 2010 13:22:29 +0100
Subject: [PATCH] various packages: - syncing

---
 .../hal/{init.d => init.d.old}/05_haldaemon   |  0
 .../x11/other/ratpoison/init.d/65_ratpoison   | 15 --------------
 .../x11/xserver/xorg-server/init.d/60_xorg    | 20 +++++++++----------
 3 files changed, 10 insertions(+), 25 deletions(-)
 rename packages/sysutils/hal/{init.d => init.d.old}/05_haldaemon (100%)
 delete mode 100755 packages/x11/other/ratpoison/init.d/65_ratpoison

diff --git a/packages/sysutils/hal/init.d/05_haldaemon b/packages/sysutils/hal/init.d.old/05_haldaemon
similarity index 100%
rename from packages/sysutils/hal/init.d/05_haldaemon
rename to packages/sysutils/hal/init.d.old/05_haldaemon
diff --git a/packages/x11/other/ratpoison/init.d/65_ratpoison b/packages/x11/other/ratpoison/init.d/65_ratpoison
deleted file mode 100755
index 6f306f7d40..0000000000
--- a/packages/x11/other/ratpoison/init.d/65_ratpoison
+++ /dev/null
@@ -1,15 +0,0 @@
-# Start ratpoison windowmanager
-#
-# If enabled, then start the window manageer.
-# The evilwm window manager should be enabled on systems that plan to use
-# games in order to enable the game emulators to get focus and exit.
-#
-# runlevels: openelec, text, debug
-
-(
-  wait_for_xorg
-
-  progress "starting Ratpoison"
-
-  /usr/bin/ratpoison > /dev/null 2>&1
-)&
\ No newline at end of file
diff --git a/packages/x11/xserver/xorg-server/init.d/60_xorg b/packages/x11/xserver/xorg-server/init.d/60_xorg
index f24f605d4e..4633055672 100644
--- a/packages/x11/xserver/xorg-server/init.d/60_xorg
+++ b/packages/x11/xserver/xorg-server/init.d/60_xorg
@@ -20,22 +20,22 @@ export DISPLAY
       [ -f $XORG_NVIDIA_CONF ] && XORG_ARGS="$XORG_ARGS -config $XORG_NVIDIA_CONF"
 
       progress "Found nVidia card, enabling binary driver as requested"
-        ionice -c 1 -n 0 mkdir -p /var/lib
-          ionice -c 1 -n 0 ln -sf /usr/lib/libGL_nvidia.so.1 /var/lib/libGL.so
-          ionice -c 1 -n 0 ln -sf /usr/lib/xorg/modules/extensions/libglx_nvidia.so /var/lib/libglx.so
+        mkdir -p /var/lib
+          ln -sf /usr/lib/libGL_nvidia.so.1 /var/lib/libGL.so
+          ln -sf /usr/lib/xorg/modules/extensions/libglx_nvidia.so /var/lib/libglx.so
 
     else
 
       progress "Not found nVidia card, enabling OSS driver as requested"
-        ionice -c 1 -n 0 mkdir -p /var/lib
-          ionice -c 1 -n 0 ln -sf /usr/lib/libGL_mesa.so.1 /var/lib/libGL.so
-          ionice -c 1 -n 0 ln -sf /usr/lib/xorg/modules/extensions/libglx_mesa.so /var/lib/libglx.so
+        mkdir -p /var/lib
+          ln -sf /usr/lib/libGL_mesa.so.1 /var/lib/libGL.so
+          ln -sf /usr/lib/xorg/modules/extensions/libglx_mesa.so /var/lib/libglx.so
     fi
 
-    ionice -c 1 -n 0 mkdir -p /var/cache/xkb
+    mkdir -p /var/cache/xkb
 
   # Make ICE directory
-    ionice -c 1 -n 0 mkdir -m 1777 -p /tmp/.ICE-unix >/dev/null 2>&1
-    ionice -c 1 -n 0 chown root:root /tmp/.ICE-unix
+    mkdir -m 1777 -p /tmp/.ICE-unix >/dev/null 2>&1
+    chown root:root /tmp/.ICE-unix
 
-    ionice -c 1 -n 0 /usr/bin/Xorg $DISPLAY vt01 $XORG_ARGS > /dev/null 2>&1 &
+    /usr/bin/Xorg $DISPLAY vt01 $XORG_ARGS > /dev/null 2>&1 &