diff options
| -rw-r--r-- | meta/packages/xserver-kdrive-common/xserver-nodm-init.bb | 2 | ||||
| -rwxr-xr-x | meta/packages/xserver-kdrive-common/xserver-nodm-init/xserver-nodm | 6 |
2 files changed, 1 insertions, 7 deletions
diff --git a/meta/packages/xserver-kdrive-common/xserver-nodm-init.bb b/meta/packages/xserver-kdrive-common/xserver-nodm-init.bb index 99141de694..e67c4b072a 100644 --- a/meta/packages/xserver-kdrive-common/xserver-nodm-init.bb +++ b/meta/packages/xserver-kdrive-common/xserver-nodm-init.bb | |||
| @@ -2,7 +2,7 @@ DESCRIPTION = "Simple Xserver Init Script (no dm)" | |||
| 2 | LICENSE = "GPL" | 2 | LICENSE = "GPL" |
| 3 | SECTION = "x11" | 3 | SECTION = "x11" |
| 4 | PRIORITY = "optional" | 4 | PRIORITY = "optional" |
| 5 | PR = "r10" | 5 | PR = "r11" |
| 6 | 6 | ||
| 7 | SRC_URI = "file://xserver-nodm" | 7 | SRC_URI = "file://xserver-nodm" |
| 8 | S = ${WORKDIR} | 8 | S = ${WORKDIR} |
diff --git a/meta/packages/xserver-kdrive-common/xserver-nodm-init/xserver-nodm b/meta/packages/xserver-kdrive-common/xserver-nodm-init/xserver-nodm index 6a04efe860..b518ccc1f1 100755 --- a/meta/packages/xserver-kdrive-common/xserver-nodm-init/xserver-nodm +++ b/meta/packages/xserver-kdrive-common/xserver-nodm-init/xserver-nodm | |||
| @@ -16,15 +16,9 @@ done | |||
| 16 | 16 | ||
| 17 | case "$1" in | 17 | case "$1" in |
| 18 | start) | 18 | start) |
| 19 | # We don't want this script to block the rest of the boot process | ||
| 20 | if [ "$2" != "background" ]; then | ||
| 21 | $0 $1 background & | ||
| 22 | else | ||
| 23 | . /etc/profile | 19 | . /etc/profile |
| 24 | |||
| 25 | echo "Starting Xserver" | 20 | echo "Starting Xserver" |
| 26 | /etc/X11/Xserver & | 21 | /etc/X11/Xserver & |
| 27 | fi | ||
| 28 | ;; | 22 | ;; |
| 29 | 23 | ||
| 30 | stop) | 24 | stop) |
