diff options
| author | marcus <marcus@df743ca5-7f9a-e211-a948-0013205c9059> | 2008-02-05 13:54:22 +0800 |
|---|---|---|
| committer | marcus <marcus@df743ca5-7f9a-e211-a948-0013205c9059> | 2008-02-05 13:54:22 +0800 |
| commit | 9da82565726c599768fe2e69d22138f4154c2739 (patch) | |
| tree | be4f09d573b61d080a391fedc2d84dbbbe53d75d | |
| parent | 020928aab42386fd82fb63d86496313ba09b9d9c (diff) | |
| download | marcuscom-ports-9da82565726c599768fe2e69d22138f4154c2739.tar marcuscom-ports-9da82565726c599768fe2e69d22138f4154c2739.tar.gz marcuscom-ports-9da82565726c599768fe2e69d22138f4154c2739.tar.bz2 marcuscom-ports-9da82565726c599768fe2e69d22138f4154c2739.tar.lz marcuscom-ports-9da82565726c599768fe2e69d22138f4154c2739.tar.xz marcuscom-ports-9da82565726c599768fe2e69d22138f4154c2739.tar.zst marcuscom-ports-9da82565726c599768fe2e69d22138f4154c2739.zip | |
Okay, so here's the problem. init runs the rc scripts before reading
/etc/ttys. This presents a problem to gdm and ConsoleKit because they
need to access VT resources when they start. When this doesn't happen, we
have a problem.
To solve this, I created vty-checker. Sounded like a good idea, except that
opening the ttyv* devices will always work -- even when the console isn't
ready. So let's try a new approach. Instead of looping on vty-checker,
loop on ps, and look for getty processes. Do not start gdm and hald
until we see them.
If anyone has a better idea of something to check that will definitely tell
us when the console is fully initialized, PLEASE let me know.
git-svn-id: svn://creme-brulee.marcuscom.com/ports/trunk@10346 df743ca5-7f9a-e211-a948-0013205c9059
| -rw-r--r-- | sysutils/hal/Makefile | 4 | ||||
| -rw-r--r-- | sysutils/hal/files/hald.in | 2 | ||||
| -rw-r--r-- | x11/gdm/Makefile | 4 | ||||
| -rw-r--r-- | x11/gdm/files/gdm.in | 4 |
4 files changed, 7 insertions, 7 deletions
diff --git a/sysutils/hal/Makefile b/sysutils/hal/Makefile index f6be90251..7b5f4cede 100644 --- a/sysutils/hal/Makefile +++ b/sysutils/hal/Makefile @@ -3,12 +3,12 @@ # Whom: Joe Marcus Clarke <marcus@FreeBSD.org> # # $FreeBSD$ -# $MCom: ports/sysutils/hal/Makefile,v 1.32 2008/01/23 20:56:13 marcus Exp $ +# $MCom: ports/sysutils/hal/Makefile,v 1.33 2008/02/05 00:52:32 marcus Exp $ # PORTNAME= hal PORTVERSION= ${HALVERSION}.${SNAPVERSION} -PORTREVISION= 4 +PORTREVISION= 5 CATEGORIES= sysutils MASTER_SITES= http://www.marcuscom.com/downloads/ diff --git a/sysutils/hal/files/hald.in b/sysutils/hal/files/hald.in index 825294725..68cfee4fa 100644 --- a/sysutils/hal/files/hald.in +++ b/sysutils/hal/files/hald.in @@ -63,7 +63,7 @@ hald_start() echo "Starting ${name}." ( iter=0 - while ! /usr/local/bin/vty-checker ; do + while ! ps -axoargs | grep "^/usr/libexec/getty " | grep -qv grep >/dev/null 2>&1; do if [ ${iter} -eq 60 ]; then break fi diff --git a/x11/gdm/Makefile b/x11/gdm/Makefile index 7c437ab4d..7b90a0c92 100644 --- a/x11/gdm/Makefile +++ b/x11/gdm/Makefile @@ -3,12 +3,12 @@ # Whom: Joe Marcus Clarke <marcus@FreeBSD.org> # # $FreeBSD$ -# $MCom: ports/x11/gdm/Makefile,v 1.103 2008/02/04 06:07:28 marcus Exp $ +# $MCom: ports/x11/gdm/Makefile,v 1.104 2008/02/05 05:32:45 mezz Exp $ # PORTNAME= gdm PORTVERSION= 2.21.6 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= x11 gnome MASTER_SITES= ${MASTER_SITE_GNOME} MASTER_SITE_SUBDIR= sources/${PORTNAME:S/2$//}/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/} diff --git a/x11/gdm/files/gdm.in b/x11/gdm/files/gdm.in index c90e98560..d990070be 100644 --- a/x11/gdm/files/gdm.in +++ b/x11/gdm/files/gdm.in @@ -1,6 +1,6 @@ #!/bin/sh # $FreeBSD$ -# $MCom: ports/x11/gdm/files/gdm.in,v 1.22 2008/02/03 00:07:45 marcus Exp $ +# $MCom: ports/x11/gdm/files/gdm.in,v 1.24 2008/02/04 06:07:29 marcus Exp $ # PROVIDE: gdm # REQUIRE: LOGIN cleanvar moused syscons dbus @@ -32,7 +32,7 @@ gdm_start() echo "Starting ${name}." ( iter=0 - while ! %%LOCALBASE%%/bin/vty-checker ; do + while ! ps -axoargs | grep "^/usr/libexec/getty " | grep -qv grep >/dev/null 2>&1; do if [ ${iter} -eq 60 ]; then break fi |