summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFabio Erculiani <lxnay@gentoo.org>2011-01-22 15:35:49 +0000
committerFabio Erculiani <lxnay@gentoo.org>2011-01-22 15:35:49 +0000
commita0a55dff67333f94238c0f20265c88552282587b (patch)
tree7f5de930e41fd2630adfa8d743455b3ebd15ad91 /x11-apps
parentadd lxdm support, see bug #330355 (diff)
downloadhistorical-a0a55dff67333f94238c0f20265c88552282587b.tar.gz
historical-a0a55dff67333f94238c0f20265c88552282587b.tar.bz2
historical-a0a55dff67333f94238c0f20265c88552282587b.zip
add lxdm support (changes required in order to load lxdm with --background), see bug #330355
Package-Manager: portage-2.2.0_alpha13/cvs/Linux x86_64
Diffstat (limited to 'x11-apps')
-rw-r--r--x11-apps/xinit/ChangeLog8
-rw-r--r--x11-apps/xinit/Manifest4
-rw-r--r--x11-apps/xinit/files/startDM.sh7
3 files changed, 12 insertions, 7 deletions
diff --git a/x11-apps/xinit/ChangeLog b/x11-apps/xinit/ChangeLog
index 97263f8b2372..6decc9c5216b 100644
--- a/x11-apps/xinit/ChangeLog
+++ b/x11-apps/xinit/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for x11-apps/xinit
-# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-apps/xinit/ChangeLog,v 1.199 2010/12/31 20:27:50 jer Exp $
+# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/x11-apps/xinit/ChangeLog,v 1.200 2011/01/22 15:35:49 lxnay Exp $
+
+ 22 Jan 2011; Fabio Erculiani <lxnay@gentoo.org> files/startDM.sh:
+ add lxdm support (changes required in order to load lxdm with
+ --background), see bug #330355
31 Dec 2010; Jeroen Roovers <jer@gentoo.org> xinit-1.3.0-r1.ebuild:
Stable for HPPA (bug #344827).
diff --git a/x11-apps/xinit/Manifest b/x11-apps/xinit/Manifest
index dac8cc372353..ec8ef2382144 100644
--- a/x11-apps/xinit/Manifest
+++ b/x11-apps/xinit/Manifest
@@ -3,7 +3,7 @@ AUX 0001-Gentoo-customizations.patch 1508 RMD160 8af271ddcaf20e588baaf6e8477e435
AUX 0001-Gentoo-specific-customizations.patch 1508 RMD160 ea3ca11470a4f504c84a9b68a059ecc458eef9e8 SHA1 437c7767000e3bc174ab122d954700187ca2b23a SHA256 b95cb7cb6be7f2a9ee42e45f77c851c3bdc50e0c3d34e2ebd706d50ba1cc60e7
AUX Xsession 2187 RMD160 ffb290e9a8656b17d7744797456a45df53cafd79 SHA1 8ba8de5114871f8500f428a03f87a42714d0ce14 SHA256 bdf2cceaafb71762bc1c6491f9bd8cc24089dea7ef65b0a030acadf7f4aa4ab3
AUX chooser.sh 1301 RMD160 4ebebef5d48d0b344f1c8af8baac60ece9671a12 SHA1 67f1afc86fb2788c6d75713bfb37550820360b5e SHA256 6ca40e2f592a10357d3396240213f0ebd81dd34882bab18bad2e9e94ad4036f0
-AUX startDM.sh 858 RMD160 d7ef866ddd09e3d4117b3363aaa6382a9b8cd153 SHA1 1b826dfb4d5a184d6d7cc1995d685b55c9c188ac SHA256 a7aca1e37e5b8fecb49aa96c4e2850547a47e154edabcdbd1cfcb8ab49337549
+AUX startDM.sh 923 RMD160 b457ea1bf2cb059a4faf5c98811589412c5026fc SHA1 b462b58ac0d76f0f5b1c8e3562da75d99488b7da SHA256 e7f2d95b3b4b6b5d711f926f8a3b7b0163b4d9e40b40489bcbd1316806e47499
AUX xdm-setup.initd-1 340 RMD160 65c5ee210735aaaa49033ae29f91ae658b8cd512 SHA1 1f5453bc2810b0cb89d3ec8f78871bbfd3a0a450 SHA256 1b8b39f95f17e0e6e61d20339804800834f4bd0fcbd6023f5d9039c1ed9599db
AUX xdm.confd-2 1262 RMD160 188ec46199168d90cb09cfe6b946bbf69f426c0c SHA1 4931a80b17a41ed4812aedf7fd1082df7e9f1335 SHA256 44042c13cbc759e2580a32f8a30b58eb2eb71c1d5f4b4cd94e9de476667862bb
AUX xdm.initd-4 6515 RMD160 3fcde7817879552b9cee0f09063116db8b8183a7 SHA1 fc4f56fdeccdec537f52fbc34c1ba89591c5b8de SHA256 1df57f1d7249d227025cd1444f857be3a78898dad06f5f0fe6be17bf2c0e1fa2
@@ -13,5 +13,5 @@ DIST xinit-1.2.0.tar.bz2 136781 RMD160 c2895db985482c13ef300a037bf2e182aeda1442
DIST xinit-1.3.0.tar.bz2 138315 RMD160 6759083ed787beace9f485e69d46b97fb397edbd SHA1 6437292214bbca6efad8889c68e72a1ca584928b SHA256 ba76e36e1a42a7cf76505b7e6fc4777f5d14f45ddff74341abfb7dd10d5fe04c
EBUILD xinit-1.2.0-r4.ebuild 1889 RMD160 4fc9db08d40c52d0929cd42430264bd51e47e98f SHA1 8636696d917514d52399fb613ae91b2c3a7a7ac9 SHA256 a5b50e1b5ab9de96f23ec7b70f3bdb974aef28f09e9c629b3d76767a08eb63c3
EBUILD xinit-1.3.0-r1.ebuild 1684 RMD160 8a0c176847274c64dad984eaaa9fa56ea56624d1 SHA1 018800139abd7214fb482ce42f23a513d76a84f6 SHA256 42e786c327bd8ec5cf4f19f2f1c919a0a9b72ac4570eba26bc8e2b6699f533f9
-MISC ChangeLog 30879 RMD160 e536728689008f9bcb125dc06687f21338b1b19b SHA1 0a6f33bb6291d997bada3da967b15324003063ec SHA256 8c9e116cc6aa18da3cdd7024481c77e2dd5126d26993f158297ccd2e115067bc
+MISC ChangeLog 31047 RMD160 6251b3fdefb0f00419d0a694d1e24beeda5b464b SHA1 9fb1a0d42a1bd13060834a638e77dc9c53053da5 SHA256 fa7720ea9d00ba5c09808aad71c3ff337c06e146ddec361ddcf25c21211e8866
MISC metadata.xml 323 RMD160 269a698f418e2fb289704dcf9dd8ee2291c5b266 SHA1 5dc07448925c52d5cc1e2c7cd1d5d9fb4537d04a SHA256 cc0d02e6168e77461049b0a9a0493e11d5ff21b19de24ac2436c536b74055444
diff --git a/x11-apps/xinit/files/startDM.sh b/x11-apps/xinit/files/startDM.sh
index 9775b07ff7a5..ebb7970400b6 100644
--- a/x11-apps/xinit/files/startDM.sh
+++ b/x11-apps/xinit/files/startDM.sh
@@ -1,7 +1,7 @@
#!/bin/sh
-# Copyright 1999-2006 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License, v2
-# $Header: /var/cvsroot/gentoo-x86/x11-apps/xinit/files/startDM.sh,v 1.4 2007/04/05 15:30:19 uberlord Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-apps/xinit/files/startDM.sh,v 1.5 2011/01/22 15:35:49 lxnay Exp $
# We need to source /etc/profile for stuff like $LANG to work
# bug #10190.
@@ -22,9 +22,10 @@ export SVCNAME=xdm
EXEC="$(get_options service)"
NAME="$(get_options name)"
PIDFILE="$(get_options pidfile)"
+START_STOP_ARGS="$(get_options start_stop_args)"
start-stop-daemon --start --exec ${EXEC} \
-${NAME:+--name} ${NAME} ${PIDFILE:+--pidfile} ${PIDFILE} || \
+${NAME:+--name} ${NAME} ${PIDFILE:+--pidfile} ${PIDFILE} ${START_STOP_ARGS} || \
eerror "ERROR: could not start the Display Manager"
# vim:ts=4