x11-apps/xinit: touch the .noxdm file in / instead of /etc/init.d (partly fixes bug #285929

Package-Manager: portage-2.2_rc41/cvs/Linux i686

4 files changed, 15 insertions, 20 deletions

diff --git a/x11-apps/xinit/ChangeLog b/x11-apps/xinit/ChangeLog
index dce3c29d12e4..91b9f502f1a5 100644
--- a/x11-apps/xinit/ChangeLog
+++ b/x11-apps/xinit/ChangeLog
@@ -1,6 +1,11 @@
 # 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.140 2009/09/21 10:12:53 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-apps/xinit/ChangeLog,v 1.141 2009/09/23 06:50:58 remi Exp $
+
+  23 Sep 2009; Rémi Cardona <remi@gentoo.org> files/xdm-setup.initd-1,
+  files/xdm.initd-3:
+  touch the .noxdm file in / instead of /etc/init.d (partly fixes bug
+  #285929
 
   21 Sep 2009; Tomáš Chvátal <scarabeus@gentoo.org>
   xinit-1.0.8-r8.ebuild:
diff --git a/x11-apps/xinit/Manifest b/x11-apps/xinit/Manifest
index fb9840571a8b..623123a48e32 100644
--- a/x11-apps/xinit/Manifest
+++ b/x11-apps/xinit/Manifest
@@ -1,17 +1,14 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX Xsession 2187 RMD160 ffb290e9a8656b17d7744797456a45df53cafd79 SHA1 8ba8de5114871f8500f428a03f87a42714d0ce14 SHA256 bdf2cceaafb71762bc1c6491f9bd8cc24089dea7ef65b0a030acadf7f4aa4ab3
 AUX chooser.sh 1496 RMD160 4d474c23dc10f2f33006885305002df7fd3197f9 SHA1 7e8f6a8238add6a1501964821d0b3ffd1ad92b80 SHA256 70bde060d86c313b90ab21a8eb9b101b08637297a1a5b4dec13e1c305ec4d1e8
 AUX gentoo-startx-customization-1.0.4.patch 3863 RMD160 65d35c3aaf72861dbf393bb23aaac97763725891 SHA1 ab0acf592dfbdfe961489f3a417be350aefac1dd SHA256 eb0a88592a22203c9e7cb4ea3051f2b96adb244585ae4b990b384b6d8a35559c
 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 7d769710e1089b428457a775f73a0979de595da0 SHA1 cba117701f6e414c0aee6d936afdf9f609bfdd19 SHA256 99a569b9e342f3a9d6319e6e32bd765dc03e116c92d8eb4217ff6b6eeab2ea1c
+AUX xdm-setup.initd-1 331 RMD160 44f5faf95dd6f19c75e19d40401470a9c49dc2a7 SHA1 61c8676bcd9e44a4f2bda7706bc5e458cfeee6ce SHA256 e10733c001699d7a70d295ace037e2ba46f76fb21748562a38d718a5a9ac2e58
 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 5333 RMD160 ff474273d00ba8388a945a51946714b45cf778d6 SHA1 29c67fd05e4596f2e980ce8b87d31c7cbfc7d8fc SHA256 ab688e8508a100cbe10230c216476bd6c068ae6f15b9361274eda762a6c59419
+AUX xdm.initd-3 5296 RMD160 d010e970c7ca321b8a57d9086583b500d91c5306 SHA1 5a32bd7293059d8fce4d369e97ba2b43729176e2 SHA256 696e9af47e7b00d2d4e6800510d615540fca07095ba4836ae234e996c704c9f9
 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
@@ -29,12 +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 22377 RMD160 52ffe6ccbd24e6dba2e3ebc96abeef1c335c40b3 SHA1 7876f680fd44a792ad912673e0ce0c0f33f3dada SHA256 d09bd117d2b0ce9fadfae4062f8bc1ee97ac983cc7aabe6440429ccde6df9f0c
+MISC ChangeLog 22546 RMD160 fcde6156c73ca3426b34d51ed581b07b73a00859 SHA1 2a6bf42becb3c209cc7fe8682736cea46c509b24 SHA256 b7f815a37e7585ec0e6d1245d6f6dc13a7db846ae945c1b7e13c9f2c6bf91d96
 MISC metadata.xml 272 RMD160 d0b40c3604f1b076f4ea2ead421b7361de293dce SHA1 9105900f56ba880d256b70bce06dd1cb69b1d4e6 SHA256 0e394010bdee148e101784bb38e4b1cdb106da7e2e5a7fc4fde946c65d0e4f7d
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.11 (GNU/Linux)
-
-iEYEARECAAYFAkq3UeIACgkQHB6c3gNBRYfpHwCgosxP5cwLh5SlnBLOreZQA70M
-D0EAn2hCd+xJOMy/S5gcWebfRJgbv126
-=zXjP
------END PGP SIGNATURE-----
diff --git a/x11-apps/xinit/files/xdm-setup.initd-1 b/x11-apps/xinit/files/xdm-setup.initd-1
index 3e03cfdc2b0e..4f91b9f35304 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.2 2009/09/17 16:30:22 williamh Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-apps/xinit/files/xdm-setup.initd-1,v 1.3 2009/09/23 06:50:58 remi Exp $
 
 depend() {
 	need localmount
@@ -9,6 +9,6 @@ depend() {
 
 start() {
 	if get_bootparam "nox" ; then
-		touch /etc/init.d/.noxdm
+		touch /.noxdm
 	fi
 }
diff --git a/x11-apps/xinit/files/xdm.initd-3 b/x11-apps/xinit/files/xdm.initd-3
index 46beb325edf5..9ce98c8c258d 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.2 2009/09/15 00:27:45 williamh Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-apps/xinit/files/xdm.initd-3,v 1.3 2009/09/23 06:50:58 remi 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 /etc/init.d/.noxdm
+	if [ -f /.noxdm ] ; then
+		einfo "Skipping ${EXE}, /.noxdm found"
+		rm /.noxdm
 		return 1
 	fi