1 |
williamh 09/10/07 16:59:42 |
2 |
|
3 |
Modified: xdm.initd-3 |
4 |
Log: |
5 |
only check for .noxdm in /etc. This is another update for #287913. |
6 |
(Portage version: 2.2_rc44/cvs/Linux i686) |
7 |
|
8 |
Revision Changes Path |
9 |
1.7 x11-apps/xinit/files/xdm.initd-3 |
10 |
|
11 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-apps/xinit/files/xdm.initd-3?rev=1.7&view=markup |
12 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-apps/xinit/files/xdm.initd-3?rev=1.7&content-type=text/plain |
13 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-apps/xinit/files/xdm.initd-3?r1=1.6&r2=1.7 |
14 |
|
15 |
Index: xdm.initd-3 |
16 |
=================================================================== |
17 |
RCS file: /var/cvsroot/gentoo-x86/x11-apps/xinit/files/xdm.initd-3,v |
18 |
retrieving revision 1.6 |
19 |
retrieving revision 1.7 |
20 |
diff -u -r1.6 -r1.7 |
21 |
--- xdm.initd-3 6 Oct 2009 16:44:38 -0000 1.6 |
22 |
+++ xdm.initd-3 7 Oct 2009 16:59:42 -0000 1.7 |
23 |
@@ -1,7 +1,7 @@ |
24 |
#!/sbin/runscript |
25 |
# Copyright 1999-2004 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.initd-3,v 1.6 2009/10/06 16:44:38 williamh Exp $ |
28 |
+# $Header: /var/cvsroot/gentoo-x86/x11-apps/xinit/files/xdm.initd-3,v 1.7 2009/10/07 16:59:42 williamh Exp $ |
29 |
|
30 |
# This is here to serve as a note to myself, and future developers. |
31 |
# |
32 |
@@ -127,9 +127,9 @@ |
33 |
local EXE= NAME= PIDFILE= |
34 |
setup_dm |
35 |
|
36 |
- if [ -f /etc/init.d/.noxdm -o -f /tmp/.noxdm -o -f /etc/.noxdm ]; then |
37 |
- einfo "Skipping ${EXE}, .noxdm found in /tmp, /etc/init.d or /etc" |
38 |
- rm /etc/.noxdm /etc/init.d/.noxdm /tmp/.noxdm |
39 |
+ if [ -f /etc/.noxdm ]; then |
40 |
+ einfo "Skipping ${EXE}, /etc/.noxdm found" |
41 |
+ rm /etc/.noxdm |
42 |
return 0 |
43 |
fi |