From a26bfac252d17c5d300d7a522db06f7733d817e1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <mgorny@gentoo.org>
Date: Sat, 2 Oct 2010 19:06:55 +0200
Subject: [PATCH 2/2] x11-apps/xinit: startDM.sh: support backgrounding within s-s-d (for lxdm), general cleanup.

(Portage version: 2.2_rc88_p61/git/Linux x86_64, unsigned Manifest commit)
---
 x11-apps/xinit/Manifest         |    2 +-
 x11-apps/xinit/files/startDM.sh |   17 ++++++++++-------
 2 files changed, 11 insertions(+), 8 deletions(-)

diff --git a/x11-apps/xinit/Manifest b/x11-apps/xinit/Manifest
index b93dff2..1d53a2e 100644
--- a/x11-apps/xinit/Manifest
+++ b/x11-apps/xinit/Manifest
@@ -5,7 +5,7 @@ AUX 00-xhost 255 RMD160 4009438bd6ffbd718ea0221d6a1b8641c51a101c SHA1 91adb21d02
 AUX 0001-Gentoo-specific-customizations-r1.patch 1476 RMD160 9168172406dd84e94229dafa3ac320b10e1349e0 SHA1 839224a56ce908c7a8a7f1a10924fc03e634aace SHA256 2fc0b500e71548cdeff42b84505e9493ed0fe8c94f403eacae95bb6310dbce34
 AUX Xsession 2187 RMD160 ffb290e9a8656b17d7744797456a45df53cafd79 SHA1 8ba8de5114871f8500f428a03f87a42714d0ce14 SHA256 bdf2cceaafb71762bc1c6491f9bd8cc24089dea7ef65b0a030acadf7f4aa4ab3
 AUX chooser.sh 1301 RMD160 47ae0768ed54f235443399bdf08632c9f5cd3d10 SHA1 c378244ce59d74c966d564b3b34ac8168e3d0352 SHA256 5808080351f80c56b5ab78946103551a628925a0a3a95417b28002bf6e088212
-AUX startDM.sh 858 RMD160 d7ef866ddd09e3d4117b3363aaa6382a9b8cd153 SHA1 1b826dfb4d5a184d6d7cc1995d685b55c9c188ac SHA256 a7aca1e37e5b8fecb49aa96c4e2850547a47e154edabcdbd1cfcb8ab49337549
+AUX startDM.sh 951 RMD160 b2d170d2c8c924e36e86b4874caa127da1542340 SHA1 b6c874fd7a4a5aafdabdb0ccbd47c79a7701d106 SHA256 a36379331da4ce1b85eae228350bb555426d4960b45bfc8ad09befcdc25fc72d
 AUX xserver.pamd 125 RMD160 4b75f8bf5e68ac7181a22beaccc153ac250eb8e9 SHA1 e35845021328044659036b9f82a95c17f21beb25 SHA256 f179c3417b94295fe12776f9da4a08898a3ee4199e26abff6457717caeb29bb2
 AUX xserverrc 30 RMD160 7575b72f2f5ec4afba3e3700c213a7fbe40a0f8d SHA1 febf89ebfcc056c16bf70a4e651f4074af71b224 SHA256 18c040add4d137aaa58f76b134088acb1269dd291a14bcc283765c6c897d49fe
 EBUILD xinit-9999.ebuild 1654 RMD160 a6a1ba9ad8e0cba5592b8e6d671b4dd65a85d52f SHA1 82349f6e72b353870bad4231948fe62f40c8615b SHA256 29f2390a98ecc339b95b6677c79a904aaa557b1d9141a4b1c1ee8b36efd4a0ec
diff --git a/x11-apps/xinit/files/startDM.sh b/x11-apps/xinit/files/startDM.sh
index 9775b07..705a7dc 100755
--- a/x11-apps/xinit/files/startDM.sh
+++ b/x11-apps/xinit/files/startDM.sh
@@ -10,7 +10,7 @@
 . /etc/init.d/functions.sh
 
 # baselayout-1 compat
-if ! type get_options >/dev/null 2>/dev/null ; then
+if ! type get_options >/dev/null 2>&1 ; then
 	[ -r "${svclib}"/sh/rc-services.sh ] && . "${svclib}"/sh/rc-services.sh
 fi
 
@@ -19,12 +19,15 @@ fi
 export GDK_USE_XFT=1
 
 export SVCNAME=xdm
-EXEC="$(get_options service)"
-NAME="$(get_options name)"
-PIDFILE="$(get_options pidfile)"
+EXEC=$(get_options service)
+NAME=$(get_options name)
+PIDFILE=$(get_options pidfile)
+BACKGROUND=$(get_options bkgnd)
 
-start-stop-daemon --start --exec ${EXEC} \
-${NAME:+--name} ${NAME} ${PIDFILE:+--pidfile} ${PIDFILE} || \
-eerror "ERROR: could not start the Display Manager"
+yesno "${BACKGROUND}" || unset BACKGROUND
+
+start-stop-daemon --start --exec ${EXEC} ${BACKGROUND:+--background} \
+		${NAME:+--name ${NAME}} ${PIDFILE:+--pidfile ${PIDFILE}} || \
+	eerror "ERROR: could not start the Display Manager"
 
 # vim:ts=4
-- 
1.7.3.1