summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rwxr-xr-xrecipes/xserver-nodm-init/xserver-nodm-init-1.0/xserver-nodm (renamed from recipes/xserver-kdrive-common/xserver-nodm-init/xserver-nodm)0
-rwxr-xr-xrecipes/xserver-nodm-init/xserver-nodm-init-2.0/xserver-nodm44
-rw-r--r--recipes/xserver-nodm-init/xserver-nodm-init_1.0.bb (renamed from recipes/xserver-kdrive-common/xserver-nodm-init.bb)0
-rw-r--r--recipes/xserver-nodm-init/xserver-nodm-init_2.0.bb22
4 files changed, 66 insertions, 0 deletions
diff --git a/recipes/xserver-kdrive-common/xserver-nodm-init/xserver-nodm b/recipes/xserver-nodm-init/xserver-nodm-init-1.0/xserver-nodm
index 1f0fa47be6..1f0fa47be6 100755
--- a/recipes/xserver-kdrive-common/xserver-nodm-init/xserver-nodm
+++ b/recipes/xserver-nodm-init/xserver-nodm-init-1.0/xserver-nodm
diff --git a/recipes/xserver-nodm-init/xserver-nodm-init-2.0/xserver-nodm b/recipes/xserver-nodm-init/xserver-nodm-init-2.0/xserver-nodm
new file mode 100755
index 0000000000..5a4b0904a3
--- /dev/null
+++ b/recipes/xserver-nodm-init/xserver-nodm-init-2.0/xserver-nodm
@@ -0,0 +1,44 @@
+#!/bin/sh
+
+. /etc/init.d/functions
+
+for x in $(cat /proc/cmdline); do
+ case $x in
+ x11=false)
+ echo "X Server disabled"
+ exit 0;
+ ;;
+ esac
+done
+
+case "$1" in
+ start)
+ # We don't want this script to block the rest of the boot process
+ if [ "$2" != "background" ]; then
+ $0 $1 background &
+ else
+ . /etc/profile
+
+ echo "Starting Xserver"
+ . /etc/X11/xserver-common
+ xinit /etc/X11/Xsession -- `which $XSERVER` $ARGS
+ fi
+ ;;
+
+ stop)
+ echo "Stopping XServer"
+ killproc xinit
+ ;;
+
+ restart)
+ $0 stop
+ sleep 1
+ $0 start
+ ;;
+
+ *)
+ echo "usage: $0 { start | stop | restart }"
+ ;;
+esac
+
+exit 0
diff --git a/recipes/xserver-kdrive-common/xserver-nodm-init.bb b/recipes/xserver-nodm-init/xserver-nodm-init_1.0.bb
index 01bdd5559c..01bdd5559c 100644
--- a/recipes/xserver-kdrive-common/xserver-nodm-init.bb
+++ b/recipes/xserver-nodm-init/xserver-nodm-init_1.0.bb
diff --git a/recipes/xserver-nodm-init/xserver-nodm-init_2.0.bb b/recipes/xserver-nodm-init/xserver-nodm-init_2.0.bb
new file mode 100644
index 0000000000..91ccf06f63
--- /dev/null
+++ b/recipes/xserver-nodm-init/xserver-nodm-init_2.0.bb
@@ -0,0 +1,22 @@
+DESCRIPTION = "Simple Xserver Init Script (no dm)"
+LICENSE = "GPL"
+SECTION = "x11"
+PRIORITY = "optional"
+RDEPENDS = "xserver-common (>= 1.30) xinit"
+DEFAULT_PREFERENCE = "-1"
+
+SRC_URI = "file://xserver-nodm"
+S = ${WORKDIR}
+
+PACKAGE_ARCH = "all"
+
+do_install() {
+ install -d ${D}/etc
+ install -d ${D}/etc/init.d
+ install xserver-nodm ${D}/etc/init.d
+}
+
+inherit update-rc.d
+
+INITSCRIPT_NAME = "xserver-nodm"
+INITSCRIPT_PARAMS = "start 01 5 2 . stop 01 1 6 ."