From eaac721aaae14074b6b904f5ed46005f058b9268 Mon Sep 17 00:00:00 2001
From: Stephan Raue <stephan@mobile.openelec.tv>
Date: Mon, 14 Sep 2009 18:35:48 +0200
Subject: [PATCH] busybox: move /etc/sysconfig from virtual/image to busybox

---
 packages/sysutils/busybox/config/sysconfig    | 24 ++++++++
 packages/virtual/image/config/etc/conf.d/core | 59 -------------------
 packages/virtual/image/config/etc/sysconfig   | 20 -------
 3 files changed, 24 insertions(+), 79 deletions(-)
 create mode 100644 packages/sysutils/busybox/config/sysconfig
 delete mode 100644 packages/virtual/image/config/etc/conf.d/core
 delete mode 100644 packages/virtual/image/config/etc/sysconfig

diff --git a/packages/sysutils/busybox/config/sysconfig b/packages/sysutils/busybox/config/sysconfig
new file mode 100644
index 0000000000..95b4477665
--- /dev/null
+++ b/packages/sysutils/busybox/config/sysconfig
@@ -0,0 +1,24 @@
+# parse command line arguments
+for arg in $(cat /proc/cmdline); do
+  case $arg in
+    debugging)
+      DEBUG=yes
+      ;;
+  esac
+done
+
+progress() {
+  if test "$DEBUG" = yes; then
+    echo "### $1 ###"
+  fi
+}
+
+for config in `ls /etc/conf.d/`; do
+  . /etc/conf.d/$config
+done
+
+#/usr/bin/test -r /etc/conf.d/boot          && . /etc/conf.d/boot
+#/usr/bin/test -r /etc/conf.d/core          && . /etc/conf.d/core
+#/usr/bin/test -r /etc/conf.d/debug         && . /etc/conf.d/dhcp.override
+#/usr/bin/test -r /etc/conf.d/dhcp          && . /etc/conf.d/dhcp
+#/usr/bin/test -r /etc/conf.d/elisa         && . /etc/conf.d/elisa
diff --git a/packages/virtual/image/config/etc/conf.d/core b/packages/virtual/image/config/etc/conf.d/core
deleted file mode 100644
index 8cd830f3d5..0000000000
--- a/packages/virtual/image/config/etc/conf.d/core
+++ /dev/null
@@ -1,59 +0,0 @@
-################################################################################
-# Core environment variables.
-#
-# This file contains non-OpenELEC evironment variables as well as OpenELEC
-# evironment variables that are not user defined.
-################################################################################
-
-#-------------------------------------------------------------------------------
-# General environment variables.
-#-------------------------------------------------------------------------------
-PATH="/bin:/sbin:/usr/bin:/usr/sbin"
-export PATH
-
-#-------------------------------------------------------------------------------
-# Home environment variables.
-#-------------------------------------------------------------------------------
-HOME="/storage"
-export HOME
-
-#-------------------------------------------------------------------------------
-# Prompt environment variables.
-#-------------------------------------------------------------------------------
-PS1='\u@\h:\w \$ '
-
-#-------------------------------------------------------------------------------
-# Language variables.
-#-------------------------------------------------------------------------------
-LANG='de_DE.UTF-8'
-
-export LANG
-
-#-------------------------------------------------------------------------------
-# X environment variables.
-#-------------------------------------------------------------------------------
-DISPLAY=':0.0'
-TTY=1
-XINITRC='/usr/lib/X11/xinit/xinitrc'
-XSERVERRC='/usr/lib/X11/xinit/xserverrc'
-
-export DISPLAY
-export XINITRC
-export XSERVERRC
-export TTY
-
-#-------------------------------------------------------------------------------
-# Turn on/off WindowManager
-#-------------------------------------------------------------------------------
-OE_X_WM_ENABLED=yes
-
-#-------------------------------------------------------------------------------
-# Elisas environment variables.
-#-------------------------------------------------------------------------------
-ELISA_FULLSCREEN=yes
-
-if test "$DEBUG" = yes; then
-  ELISA_DEBUG=yes
-  ELISA_TMPLOG=yes
-  ELISA_LOGFILE='/var/log/elisa.log'
-fi
\ No newline at end of file
diff --git a/packages/virtual/image/config/etc/sysconfig b/packages/virtual/image/config/etc/sysconfig
deleted file mode 100644
index 48b32e38e0..0000000000
--- a/packages/virtual/image/config/etc/sysconfig
+++ /dev/null
@@ -1,20 +0,0 @@
-# parse command line arguments
-for arg in $(cat /proc/cmdline); do
-  case $arg in
-    debugging)
-      DEBUG=yes
-      ;;
-  esac
-done
-
-progress() {
-  if test "$DEBUG" = yes; then
-    echo "### $1 ###"
-  fi
-}
-
-/usr/bin/test -r /etc/conf.d/boot          && . /etc/conf.d/boot
-/usr/bin/test -r /etc/conf.d/core          && . /etc/conf.d/core
-/usr/bin/test -r /etc/conf.d/debug         && . /etc/conf.d/dhcp.override
-/usr/bin/test -r /etc/conf.d/dhcp          && . /etc/conf.d/dhcp
-/usr/bin/test -r /etc/conf.d/elisa         && . /etc/conf.d/elisa