summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRoy Marples <uberlord@gentoo.org>2007-05-24 09:34:36 +0000
committerRoy Marples <uberlord@gentoo.org>2007-05-24 09:34:36 +0000
commit63fb878ef9f94f59dd69cd41f7ecedd48bedd262 (patch)
tree9dc6f96bbe76cbfe8532fb3d0c45419115403d31 /x11-apps/xinit
parentWe should not RDEPEND on sources nor DEPEND on runtime only stuff (diff)
downloadgentoo-2-63fb878ef9f94f59dd69cd41f7ecedd48bedd262.tar.gz
gentoo-2-63fb878ef9f94f59dd69cd41f7ecedd48bedd262.tar.bz2
gentoo-2-63fb878ef9f94f59dd69cd41f7ecedd48bedd262.zip
Test the correct tty in inittab
(Portage version: 2.1.2.7)
Diffstat (limited to 'x11-apps/xinit')
-rw-r--r--x11-apps/xinit/ChangeLog5
-rwxr-xr-xx11-apps/xinit/files/xdm.initd-14
2 files changed, 6 insertions, 3 deletions
diff --git a/x11-apps/xinit/ChangeLog b/x11-apps/xinit/ChangeLog
index 7bdc83a2c336..816ff853a51d 100644
--- a/x11-apps/xinit/ChangeLog
+++ b/x11-apps/xinit/ChangeLog
@@ -1,6 +1,9 @@
# ChangeLog for x11-apps/xinit
# Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-apps/xinit/ChangeLog,v 1.88 2007/05/23 12:21:51 uberlord Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-apps/xinit/ChangeLog,v 1.89 2007/05/24 09:34:36 uberlord Exp $
+
+ 24 May 2007; Roy Marples <uberlord@gentoo.org> files/xdm.initd-1:
+ Test the correct tty in inittab
*xinit-1.0.3-r4 (23 May 2007)
diff --git a/x11-apps/xinit/files/xdm.initd-1 b/x11-apps/xinit/files/xdm.initd-1
index a6f5c3f0a3a7..47aac8b69902 100755
--- a/x11-apps/xinit/files/xdm.initd-1
+++ b/x11-apps/xinit/files/xdm.initd-1
@@ -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-1,v 1.1 2007/05/23 12:21:51 uberlord Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-apps/xinit/files/xdm.initd-1,v 1.2 2007/05/24 09:34:36 uberlord Exp $
# This is here to serve as a note to myself, and future developers.
#
@@ -113,7 +113,7 @@ cmdline_opt() {
# Check to see if something is defined on our VT
vtstatic() {
if [ -e /etc/inittab ] ; then
- grep -Eq "^[^#]+.*\<tty7\>" /etc/inittab
+ grep -Eq "^[^#]+.*\<tty$1\>" /etc/inittab
elif [ -e /etc/ttys ] ; then
grep -q "^ttyv$(($1 - 1))" /etc/ttys
else