diff options
| author |   William Hubbs <williamh@gentoo.org> | 2009-09-23 16:03:07 +0000 |
|---|---|---|
| committer | William Hubbs <williamh@gentoo.org> | 2009-09-23 16:03:07 +0000 |
| commit | 1b4520f77096097bf52dfd9174dfd1a1b5557d13 (patch) | |
| tree | 2e0547e1819f821458d3190e3647791d0aa47a56 /x11-apps/xinit | |
| parent | Remove virtual/libc (diff) | |
| download | gentoo-2-1b4520f77096097bf52dfd9174dfd1a1b5557d13.tar.gz gentoo-2-1b4520f77096097bf52dfd9174dfd1a1b5557d13.tar.bz2 gentoo-2-1b4520f77096097bf52dfd9174dfd1a1b5557d13.zip | |
partially reverted the changes for bug 285929. The location of .noxdm needs to be consistent with livecd-tools.
(Portage version: 2.2_rc41/cvs/Linux i686)
Diffstat (limited to 'x11-apps/xinit')
| -rw-r--r-- | x11-apps/xinit/ChangeLog | 10 | ||||
| -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, 15 insertions, 7 deletions
diff --git a/x11-apps/xinit/ChangeLog b/x11-apps/xinit/ChangeLog index 91b9f502f1a5..85023ef1621d 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.141 2009/09/23 06:50:58 remi Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-apps/xinit/ChangeLog,v 1.142 2009/09/23 16:03:07 williamh Exp $ + + 23 Sep 2009; William Hubbs <williamh@gentoo.org> files/xdm-setup.initd-1, + files/xdm.initd-3: + Partially reverted the fix for #285929 by touching .noxdm in /etc/init.d + instead of / for now. This needs to be here to be consistent with + livecd-tools. Also changed the xdm init script to return successful + when .noxdm is touched so that it will not be restarted in later + runlevels. 23 Sep 2009; Rémi Cardona <remi@gentoo.org> files/xdm-setup.initd-1, files/xdm.initd-3: diff --git a/x11-apps/xinit/files/xdm-setup.initd-1 b/x11-apps/xinit/files/xdm-setup.initd-1 index 4f91b9f35304..d94f7441b33f 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.3 2009/09/23 06:50:58 remi Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-apps/xinit/files/xdm-setup.initd-1,v 1.4 2009/09/23 16:03:07 williamh Exp $ depend() { need localmount @@ -9,6 +9,6 @@ depend() { start() { if get_bootparam "nox" ; then - touch /.noxdm + touch /etc/init.d/.noxdm fi } diff --git a/x11-apps/xinit/files/xdm.initd-3 b/x11-apps/xinit/files/xdm.initd-3 index 9ce98c8c258d..093da9e7988f 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.3 2009/09/23 06:50:58 remi Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-apps/xinit/files/xdm.initd-3,v 1.4 2009/09/23 16:03:07 williamh Exp $ # This is here to serve as a note to myself, and future developers. # @@ -127,10 +127,10 @@ start() { local EXE= NAME= PIDFILE= setup_dm - if [ -f /.noxdm ] ; then - einfo "Skipping ${EXE}, /.noxdm found" + if [ -f /etc/init.d/.noxdm ] ; then + einfo "Skipping ${EXE}, /etc/init.d/.noxdm found" rm /.noxdm - return 1 + return 0 fi ebegin "Setting up ${EXE##*/}" |