diff options
| author |   William Hubbs <williamh@gentoo.org> | 2009-09-24 17:07:57 +0000 |
|---|---|---|
| committer | William Hubbs <williamh@gentoo.org> | 2009-09-24 17:07:57 +0000 |
| commit | a88cd293cf881f57f9c11162a64be36eceb5f2fa (patch) | |
| tree | 965ca63c863301c91aade8d426e7cf1897915581 /x11-apps | |
| parent | [sys-cluster/glusterfs] disable berkdb deps (diff) | |
| download | gentoo-2-a88cd293cf881f57f9c11162a64be36eceb5f2fa.tar.gz gentoo-2-a88cd293cf881f57f9c11162a64be36eceb5f2fa.tar.bz2 gentoo-2-a88cd293cf881f57f9c11162a64be36eceb5f2fa.zip | |
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.
(Portage version: 2.2_rc41/cvs/Linux i686)
Diffstat (limited to 'x11-apps')
| -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 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/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 |