diff options
| author |   Rémi Cardona <remi@gentoo.org> | 2009-09-23 06:50:58 +0000 |
|---|---|---|
| committer | Rémi Cardona <remi@gentoo.org> | 2009-09-23 06:50:58 +0000 |
| commit | 9fe655c5f4e7e5321d372bc1b034ec860b3f0128 (patch) | |
| tree | 6195c44178a189e0e44e8a107088df43df32ed26 /x11-apps/xinit | |
| parent | x11-libs/libdrm: bump to 2.4.14 (diff) | |
| download | gentoo-2-9fe655c5f4e7e5321d372bc1b034ec860b3f0128.tar.gz gentoo-2-9fe655c5f4e7e5321d372bc1b034ec860b3f0128.tar.bz2 gentoo-2-9fe655c5f4e7e5321d372bc1b034ec860b3f0128.zip | |
x11-apps/xinit: touch the .noxdm file in / instead of /etc/init.d (partly fixes bug #285929
(Portage version: 2.2_rc41/cvs/Linux i686)
Diffstat (limited to 'x11-apps/xinit')
| -rw-r--r-- | x11-apps/xinit/ChangeLog | 7 | ||||
| -rw-r--r-- | x11-apps/xinit/files/xdm-setup.initd-1 | 4 | ||||
| -rwxr-xr-x | x11-apps/xinit/files/xdm.initd-3 | 8 |
3 files changed, 12 insertions, 7 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/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 |