update for bug 285929.

Now the xdm-setup script creates the .noxdm file in /tmp and the xdm
script checks for it in /tmp and /etc/init.d so that it supports
livecd-tools as well as the gentoo=nox option.
Package-Manager: portage-2.2_rc41/cvs/Linux i686

4 files changed, 18 insertions, 10 deletions

diff --git a/x11-apps/xinit/ChangeLog b/x11-apps/xinit/ChangeLog
index 85023ef1621d..f2120718aa34 100644
--- a/x11-apps/xinit/ChangeLog
+++ b/x11-apps/xinit/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for x11-apps/xinit
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-apps/xinit/ChangeLog,v 1.142 2009/09/23 16:03:07 williamh Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-apps/xinit/ChangeLog,v 1.143 2009/09/24 17:07:57 williamh Exp $
+
+  24 Sep 2009; William Hubbs <williamh@gentoo.org> files/xdm-setup.initd-1,
+  files/xdm.initd-3:
+  update for bug 285929.
+  Now the xdm-setup script creates the .noxdm file in /tmp and the xdm
+  script checks for it in /tmp and /etc/init.d so that it supports
+  livecd-tools as well as the gentoo=nox option.
+
 
   23 Sep 2009; William Hubbs <williamh@gentoo.org> files/xdm-setup.initd-1,
   files/xdm.initd-3:
diff --git a/x11-apps/xinit/Manifest b/x11-apps/xinit/Manifest
index a77f65d546d2..be77289bc226 100644
--- a/x11-apps/xinit/Manifest
+++ b/x11-apps/xinit/Manifest
@@ -4,11 +4,11 @@ AUX gentoo-startx-customization-1.0.4.patch 3863 RMD160 65d35c3aaf72861dbf393bb2
 AUX gentoo-startx-customization-1.0.8.patch 3953 RMD160 cf0bc0b1439437b8a92a1f569445e8fbef1bb1cd SHA1 8020676fe7c9a2fed0c2a09cea0c273984a3cdc0 SHA256 29d6a004240672b86d6cc34e9cab5dcc88abcb84974d98b1085a9eb0dc852f38
 AUX nolisten-tcp-and-black-background.patch 381 RMD160 f767995059b6b3826e662ad71fd9348609383dc2 SHA1 8210062a9e3bac93e9d5b0a18633e6a98a6829f4 SHA256 481252dd205a0eefcfdf1a265b2c359280363ceaf1460ca5eab42b9eb3b3c826
 AUX startDM.sh 858 RMD160 d7ef866ddd09e3d4117b3363aaa6382a9b8cd153 SHA1 1b826dfb4d5a184d6d7cc1995d685b55c9c188ac SHA256 a7aca1e37e5b8fecb49aa96c4e2850547a47e154edabcdbd1cfcb8ab49337549
-AUX xdm-setup.initd-1 346 RMD160 d062a62418b1769e793467b1f2674dbd97301de4 SHA1 f5e0699bc88b5a03728666ae6343406496df168b SHA256 65a003ba67646d9b88b17343f1b2095ff767e8d320f22c0292c9b758b409c469
+AUX xdm-setup.initd-1 339 RMD160 8be48225ea6df9434d78981437cdbfdd29e10055 SHA1 15e723b54c27a422e9d53b98b3c5471e111817c2 SHA256 bce5865e7da9bcedeef66e8ce1b6fc7e303cf8d1f44ecb0e6347c045414a7d7d
 AUX xdm.confd-1 722 RMD160 3a4f800a37935e711112ede9c847837104e4100f SHA1 d3b2551ec7be8e5cfa42cc14e1d47ab37ac9f116 SHA256 1f6a2bb28e499698bbdba825d6dcbc81622579b1cf5c9e33538b252d254935c3
 AUX xdm.initd-1 5207 RMD160 c95d2df2feff76770ece8f0ec86e9bb53d76a257 SHA1 faefdeeca446fff29da2f4e546a3b0bcc94e6372 SHA256 891c7b060c6b47c135b32ffd918a0b6add5e9c7c03893ee0c1d56b64bd7987ea
 AUX xdm.initd-2 5455 RMD160 d88b99f7b4e7f181ad7c5ee817b881e0f2f797b6 SHA1 d3656459d81e195e7c8d829f82d7a9a32f26592f SHA256 ea6567021649df1084e2bc136a12a067b8bdf70e44978c6e3560e37d47141a23
-AUX xdm.initd-3 5322 RMD160 a03d564579031005bca079e6df98c905fc601298 SHA1 46bc1398da879af809ce09922c26c7d136411164 SHA256 39be241b72b79c3256147dd9b2dfbd4bccf4505e22068ccfdb1473cf2ee101c4
+AUX xdm.initd-3 5378 RMD160 a8f0f0dd7687c35d1c56dad074efd67624195d23 SHA1 307c4a46036ad63a09c2ccb69fc0d2c65ba5ab4f SHA256 59961db339fa8316802b1712ae306da529d50eae25419b0ef0a78735ea8ee323
 AUX xdm.start 3974 RMD160 67f3b69fc9c006146999271935e1ae06d093130a SHA1 12763e84e31632c0421159e8feca2f9855966b7b SHA256 151b697f62e335850118a5d7d113d83fb37f2a75407985cd1e433de93eb55ded
 AUX xinit-1.0.4-console-kit.patch 4956 RMD160 286437f158d6a9ec588377b01d2b336d391bff37 SHA1 8d1ef61ec11bdf0308474560f0ed5156a6714d5f SHA256 65fd0800ccdecca979c8943755c5656fd022b54a160b32489ad95495521949e4
 AUX xinitrc 1059 RMD160 3f3ae64f6056055d3d42e471a5dd4263aa1b66db SHA1 edd6919448086273a73b1de897afe93e01b046c8 SHA256 53871c9c3198b38d73b08da3837d1331240a5d45e987a5b8135e7116c02d8eff
@@ -26,5 +26,5 @@ EBUILD xinit-1.0.8-r4.ebuild 2146 RMD160 76cfb718bcfd7ab710a7e3bb609a42c60172654
 EBUILD xinit-1.0.8-r7.ebuild 2282 RMD160 af442abba5f78d4208aa5e99e630384354ea80f0 SHA1 ee904a6ccaa3680331aae2b2238d430022c815ec SHA256 be7289008950fd658a10e59df310c9ba47b6e0d144d2ee8724781c5f53446ee5
 EBUILD xinit-1.0.8-r8.ebuild 2221 RMD160 431f3d971acca7efe0b58a5afc97a8fd13350fb7 SHA1 8b6e3cd94b720abc8d076d08018a669090726106 SHA256 2d9aba4211c16baa7f397a8694db96350e54ba11e78242c0baf1676fc85e56c3
 EBUILD xinit-1.0.8.ebuild 1743 RMD160 e69d30cd92810870fbb9bf4f0896778c4e162c30 SHA1 9704fa014525f1e45dddcc658d6d83990e21961a SHA256 8ed635360a4136209fe0249c53bd3254367957dec543a5f1a1f1b06fc8cefd63
-MISC ChangeLog 22941 RMD160 ed434db201f57bce07122d018c312d7488baec6d SHA1 5dd974bbe2fde8c2cea1af64f03d47603835351e SHA256 b01300d60652026fd140663451344fa12b170c200fd3152c0be505fc8a51767e
+MISC ChangeLog 23252 RMD160 7d8a93c1d5d445a4f554f9ef977595e551578b15 SHA1 e6ea6be557c53bcbbb6df152b778406a8c571389 SHA256 e1449678fc9cbbb00eb387c7fa63ea9ee7737e38dc0e17d943a6aa87ed33b76e
 MISC metadata.xml 272 RMD160 d0b40c3604f1b076f4ea2ead421b7361de293dce SHA1 9105900f56ba880d256b70bce06dd1cb69b1d4e6 SHA256 0e394010bdee148e101784bb38e4b1cdb106da7e2e5a7fc4fde946c65d0e4f7d
diff --git a/x11-apps/xinit/files/xdm-setup.initd-1 b/x11-apps/xinit/files/xdm-setup.initd-1
index d94f7441b33f..79797a4f791a 100644
--- a/x11-apps/xinit/files/xdm-setup.initd-1
+++ b/x11-apps/xinit/files/xdm-setup.initd-1
@@ -1,7 +1,7 @@
 #!/sbin/runscript
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-apps/xinit/files/xdm-setup.initd-1,v 1.4 2009/09/23 16:03:07 williamh Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-apps/xinit/files/xdm-setup.initd-1,v 1.5 2009/09/24 17:07:56 williamh Exp $
 
 depend() {
 	need localmount
@@ -9,6 +9,6 @@ depend() {
 
 start() {
 	if get_bootparam "nox" ; then
-		touch /etc/init.d/.noxdm
+		touch /tmp/.noxdm
 	fi
 }
diff --git a/x11-apps/xinit/files/xdm.initd-3 b/x11-apps/xinit/files/xdm.initd-3
index 093da9e7988f..be0337d39358 100755
--- a/x11-apps/xinit/files/xdm.initd-3
+++ b/x11-apps/xinit/files/xdm.initd-3
@@ -1,7 +1,7 @@
 #!/sbin/runscript
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License, v2
-# $Header: /var/cvsroot/gentoo-x86/x11-apps/xinit/files/xdm.initd-3,v 1.4 2009/09/23 16:03:07 williamh Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-apps/xinit/files/xdm.initd-3,v 1.5 2009/09/24 17:07:56 williamh Exp $
 
 # This is here to serve as a note to myself, and future developers.
 #
@@ -127,9 +127,9 @@ start() {
 	local EXE= NAME= PIDFILE=
 	setup_dm
 	
-	if [ -f /etc/init.d/.noxdm ] ; then
-		einfo "Skipping ${EXE}, /etc/init.d/.noxdm found"
-		rm /.noxdm
+	if [ -f /etc/init.d/.noxdm -o -f /tmp/.noxdm ] ; then
+		einfo "Skipping ${EXE}, /etc/init.d/.noxdm or /tmp/.noxdm found"
+		rm /etc/init.d/.noxdm /tmp/.noxdm
 		return 0
 	fi