diff options
| author | marcus <marcus@df743ca5-7f9a-e211-a948-0013205c9059> | 2008-02-03 08:07:45 +0800 |
|---|---|---|
| committer | marcus <marcus@df743ca5-7f9a-e211-a948-0013205c9059> | 2008-02-03 08:07:45 +0800 |
| commit | eff2b40a753ca52e76111f98b3d63ad4cc25581d (patch) | |
| tree | 90016e5a6995d4fe350aba6642c804d5d978fffb /x11/gdm | |
| parent | a5aaa9f7f2cebce80ce260499ced95a4dd0a92d3 (diff) | |
| download | marcuscom-ports-eff2b40a753ca52e76111f98b3d63ad4cc25581d.tar marcuscom-ports-eff2b40a753ca52e76111f98b3d63ad4cc25581d.tar.gz marcuscom-ports-eff2b40a753ca52e76111f98b3d63ad4cc25581d.tar.bz2 marcuscom-ports-eff2b40a753ca52e76111f98b3d63ad4cc25581d.tar.lz marcuscom-ports-eff2b40a753ca52e76111f98b3d63ad4cc25581d.tar.xz marcuscom-ports-eff2b40a753ca52e76111f98b3d63ad4cc25581d.tar.zst marcuscom-ports-eff2b40a753ca52e76111f98b3d63ad4cc25581d.zip | |
Try something a little saucy (and ugly), and make GDM wait until all VTY
lines are configured before starting. Yes, we already had code hacked into
GDM to workaround this problem, but it doesn't look like that code will
ever get committed upstream, and this will reduce our local patches in the
long run. I am not removing the local patches just yet as I want to see
if this method works first.
Having the external vty-checker will also allow other ports which need VTY
access to have a way of waiting until /etc/ttys is read, and the VTYs are
initialized.
git-svn-id: svn://creme-brulee.marcuscom.com/ports/trunk@10327 df743ca5-7f9a-e211-a948-0013205c9059
Diffstat (limited to 'x11/gdm')
| -rw-r--r-- | x11/gdm/Makefile | 6 | ||||
| -rw-r--r-- | x11/gdm/files/gdm.in | 16 |
2 files changed, 19 insertions, 3 deletions
diff --git a/x11/gdm/Makefile b/x11/gdm/Makefile index dde4322d6..b0d6245d7 100644 --- a/x11/gdm/Makefile +++ b/x11/gdm/Makefile @@ -3,11 +3,12 @@ # Whom: Joe Marcus Clarke <marcus@FreeBSD.org> # # $FreeBSD$ -# $MCom: ports/x11/gdm/Makefile,v 1.99 2008/01/23 20:55:25 marcus Exp $ +# $MCom: ports/x11/gdm/Makefile,v 1.100 2008/01/31 08:16:03 marcus Exp $ # PORTNAME= gdm PORTVERSION= 2.21.6 +PORTREVISION= 1 CATEGORIES= x11 gnome MASTER_SITES= ${MASTER_SITE_GNOME} MASTER_SITE_SUBDIR= sources/${PORTNAME:S/2$//}/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/} @@ -20,7 +21,8 @@ BUILD_DEPENDS= zenity:${PORTSDIR}/x11/zenity \ ${LOCALBASE}/libdata/pkgconfig/check.pc:${PORTSDIR}/devel/check LIB_DEPENDS= ck-connector.0:${PORTSDIR}/sysutils/consolekit RUN_DEPENDS= zenity:${PORTSDIR}/x11/zenity \ - ${LOCALBASE}/libexec/gnome-settings-daemon:${PORTSDIR}/sysutils/gnome-settings-daemon + ${LOCALBASE}/libexec/gnome-settings-daemon:${PORTSDIR}/sysutils/gnome-settings-daemon \ + vty-checker:${PORTSDIR}/sysutils/vty-checker USE_BZIP2= yes USE_GETTEXT= yes diff --git a/x11/gdm/files/gdm.in b/x11/gdm/files/gdm.in index 525e2f966..eea5b605a 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.20 2008/01/19 22:45:43 mezz Exp $ +# $MCom: ports/x11/gdm/files/gdm.in,v 1.21 2008/01/23 20:55:25 marcus Exp $ # PROVIDE: gdm # REQUIRE: LOGIN cleanvar moused syscons dbus @@ -23,5 +23,19 @@ command="%%PREFIX%%/sbin/${name}" pidfile="/var/run/${name}.pid" procname="%%PREFIX%%/sbin/gdm-binary" +start_precmd="gdm_precmd" + +gdm_precmd() +{ + iter=0 + while ! %%LOCALBASE/bin/vty-checker ; do + if [ ${iter} -eq 60 ]; then + break + fi + sleep 1 + iter=$(expr ${iter} + 1) + done +} + load_rc_config ${name} run_rc_command "$1" |