| 1 |
williamh 09/10/06 16:44:39 |
| 2 |
|
| 3 |
Modified: xdm-setup.initd-1 xdm.initd-3 |
| 4 |
Log: |
| 5 |
moved .noxdm to /etc for security bug #287913. |
| 6 |
(Portage version: 2.2_rc44/cvs/Linux i686) |
| 7 |
|
| 8 |
Revision Changes Path |
| 9 |
1.6 x11-apps/xinit/files/xdm-setup.initd-1 |
| 10 |
|
| 11 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-apps/xinit/files/xdm-setup.initd-1?rev=1.6&view=markup |
| 12 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-apps/xinit/files/xdm-setup.initd-1?rev=1.6&content-type=text/plain |
| 13 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-apps/xinit/files/xdm-setup.initd-1?r1=1.5&r2=1.6 |
| 14 |
|
| 15 |
Index: xdm-setup.initd-1 |
| 16 |
=================================================================== |
| 17 |
RCS file: /var/cvsroot/gentoo-x86/x11-apps/xinit/files/xdm-setup.initd-1,v |
| 18 |
retrieving revision 1.5 |
| 19 |
retrieving revision 1.6 |
| 20 |
diff -u -r1.5 -r1.6 |
| 21 |
--- xdm-setup.initd-1 24 Sep 2009 17:07:56 -0000 1.5 |
| 22 |
+++ xdm-setup.initd-1 6 Oct 2009 16:44:38 -0000 1.6 |
| 23 |
@@ -1,7 +1,7 @@ |
| 24 |
#!/sbin/runscript |
| 25 |
# Copyright 1999-2009 Gentoo Foundation |
| 26 |
# Distributed under the terms of the GNU General Public License v2 |
| 27 |
-# $Header: /var/cvsroot/gentoo-x86/x11-apps/xinit/files/xdm-setup.initd-1,v 1.5 2009/09/24 17:07:56 williamh Exp $ |
| 28 |
+# $Header: /var/cvsroot/gentoo-x86/x11-apps/xinit/files/xdm-setup.initd-1,v 1.6 2009/10/06 16:44:38 williamh Exp $ |
| 29 |
|
| 30 |
depend() { |
| 31 |
need localmount |
| 32 |
@@ -9,6 +9,6 @@ |
| 33 |
|
| 34 |
start() { |
| 35 |
if get_bootparam "nox" ; then |
| 36 |
- touch /tmp/.noxdm |
| 37 |
+ touch /etc/.noxdm |
| 38 |
fi |
| 39 |
} |
| 40 |
|
| 41 |
|
| 42 |
|
| 43 |
1.6 x11-apps/xinit/files/xdm.initd-3 |
| 44 |
|
| 45 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-apps/xinit/files/xdm.initd-3?rev=1.6&view=markup |
| 46 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-apps/xinit/files/xdm.initd-3?rev=1.6&content-type=text/plain |
| 47 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-apps/xinit/files/xdm.initd-3?r1=1.5&r2=1.6 |
| 48 |
|
| 49 |
Index: xdm.initd-3 |
| 50 |
=================================================================== |
| 51 |
RCS file: /var/cvsroot/gentoo-x86/x11-apps/xinit/files/xdm.initd-3,v |
| 52 |
retrieving revision 1.5 |
| 53 |
retrieving revision 1.6 |
| 54 |
diff -u -r1.5 -r1.6 |
| 55 |
--- xdm.initd-3 24 Sep 2009 17:07:56 -0000 1.5 |
| 56 |
+++ xdm.initd-3 6 Oct 2009 16:44:38 -0000 1.6 |
| 57 |
@@ -1,7 +1,7 @@ |
| 58 |
#!/sbin/runscript |
| 59 |
# Copyright 1999-2004 Gentoo Foundation |
| 60 |
# Distributed under the terms of the GNU General Public License, v2 |
| 61 |
-# $Header: /var/cvsroot/gentoo-x86/x11-apps/xinit/files/xdm.initd-3,v 1.5 2009/09/24 17:07:56 williamh Exp $ |
| 62 |
+# $Header: /var/cvsroot/gentoo-x86/x11-apps/xinit/files/xdm.initd-3,v 1.6 2009/10/06 16:44:38 williamh Exp $ |
| 63 |
|
| 64 |
# This is here to serve as a note to myself, and future developers. |
| 65 |
# |
| 66 |
@@ -127,9 +127,9 @@ |
| 67 |
local EXE= NAME= PIDFILE= |
| 68 |
setup_dm |
| 69 |
|
| 70 |
- if [ -f /etc/init.d/.noxdm -o -f /tmp/.noxdm ] ; then |
| 71 |
- einfo "Skipping ${EXE}, /etc/init.d/.noxdm or /tmp/.noxdm found" |
| 72 |
- rm /etc/init.d/.noxdm /tmp/.noxdm |
| 73 |
+ if [ -f /etc/init.d/.noxdm -o -f /tmp/.noxdm -o -f /etc/.noxdm ]; then |
| 74 |
+ einfo "Skipping ${EXE}, .noxdm found in /tmp, /etc/init.d or /etc" |
| 75 |
+ rm /etc/.noxdm /etc/init.d/.noxdm /tmp/.noxdm |
| 76 |
return 0 |
| 77 |
fi |
Archives