| 1 |
commit: 4f0297b390e48f4a327f51bd32ff8ca5d78ae9fc |
| 2 |
Author: Chi-Thanh Christopher Nguyen <chithanh <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Mon Aug 1 21:05:48 2011 +0000 |
| 4 |
Commit: Chi-Thanh Christopher Nguyen <chithanh <AT> cs <DOT> tu-berlin <DOT> de> |
| 5 |
CommitDate: Mon Aug 1 21:05:48 2011 +0000 |
| 6 |
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/x11.git;a=commit;h=4f0297b3 |
| 7 |
|
| 8 |
x11-apps/xinit: sync with portage |
| 9 |
|
| 10 |
--- |
| 11 |
x11-apps/xinit/files/startDM.sh | 7 ++++--- |
| 12 |
1 files changed, 4 insertions(+), 3 deletions(-) |
| 13 |
|
| 14 |
diff --git a/x11-apps/xinit/files/startDM.sh b/x11-apps/xinit/files/startDM.sh |
| 15 |
index 9775b07..ebb7970 100755 |
| 16 |
--- a/x11-apps/xinit/files/startDM.sh |
| 17 |
+++ b/x11-apps/xinit/files/startDM.sh |
| 18 |
@@ -1,7 +1,7 @@ |
| 19 |
#!/bin/sh |
| 20 |
-# Copyright 1999-2006 Gentoo Foundation |
| 21 |
+# Copyright 1999-2011 Gentoo Foundation |
| 22 |
# Distributed under the terms of the GNU General Public License, v2 |
| 23 |
-# $Header: /var/cvsroot/gentoo-x86/x11-apps/xinit/files/startDM.sh,v 1.4 2007/04/05 15:30:19 uberlord Exp $ |
| 24 |
+# $Header: /var/cvsroot/gentoo-x86/x11-apps/xinit/files/startDM.sh,v 1.5 2011/01/22 15:35:49 lxnay Exp $ |
| 25 |
|
| 26 |
# We need to source /etc/profile for stuff like $LANG to work |
| 27 |
# bug #10190. |
| 28 |
@@ -22,9 +22,10 @@ export SVCNAME=xdm |
| 29 |
EXEC="$(get_options service)" |
| 30 |
NAME="$(get_options name)" |
| 31 |
PIDFILE="$(get_options pidfile)" |
| 32 |
+START_STOP_ARGS="$(get_options start_stop_args)" |
| 33 |
|
| 34 |
start-stop-daemon --start --exec ${EXEC} \ |
| 35 |
-${NAME:+--name} ${NAME} ${PIDFILE:+--pidfile} ${PIDFILE} || \ |
| 36 |
+${NAME:+--name} ${NAME} ${PIDFILE:+--pidfile} ${PIDFILE} ${START_STOP_ARGS} || \ |
| 37 |
eerror "ERROR: could not start the Display Manager" |
| 38 |
|
| 39 |
# vim:ts=4 |
Archives