From 7e0ec9181dc1ec8999da139d511cbef9253a9182 Mon Sep 17 00:00:00 2001 From: jkh Date: Tue, 27 May 1997 16:41:52 +0000 Subject: Correct SNAP server paths. Bring in CDE fixes. --- usr.sbin/sade/config.c | 4 +++- usr.sbin/sade/menus.c | 8 ++++---- usr.sbin/sysinstall/config.c | 4 +++- usr.sbin/sysinstall/menus.c | 8 ++++---- 4 files changed, 14 insertions(+), 10 deletions(-) (limited to 'usr.sbin') diff --git a/usr.sbin/sade/config.c b/usr.sbin/sade/config.c index 51c51c8..43bfeba 100644 --- a/usr.sbin/sade/config.c +++ b/usr.sbin/sade/config.c @@ -4,7 +4,7 @@ * This is probably the last program in the `sysinstall' line - the next * generation being essentially a complete rewrite. * - * $Id: config.c,v 1.94 1997/05/26 04:57:56 jkh Exp $ + * $Id: config.c,v 1.95 1997/05/26 05:33:16 jkh Exp $ * * Copyright (c) 1995 * Jordan Hubbard. All rights reserved. @@ -583,6 +583,8 @@ configXFree86(dialogMenuItem *self) "to it will actually be /cdrom/CDE/dtinstall when you run it later).\n"); } else { + if (file_readable("/dist/CDE/post-install")) + systemExecute("/dist/CDE/post-install"); /* Repair the damage done by the CDE installation */ msgNotify("Doing final adjustments to Xaccel distribution..."); systemExecute("/usr/X11R6/lib/X11/AcceleratedX/bin/Xinstall"); diff --git a/usr.sbin/sade/menus.c b/usr.sbin/sade/menus.c index ca6dc60f..546e928 100644 --- a/usr.sbin/sade/menus.c +++ b/usr.sbin/sade/menus.c @@ -4,7 +4,7 @@ * This is probably the last program in the `sysinstall' line - the next * generation being essentially a complete rewrite. * - * $Id: menus.c,v 1.134 1997/05/22 21:26:10 jkh Exp $ + * $Id: menus.c,v 1.135 1997/05/23 18:54:29 jkh Exp $ * * Copyright (c) 1995 * Jordan Hubbard. All rights reserved. @@ -468,11 +468,11 @@ DMenu MenuMediaFTP = { { "URL", "Specify some other ftp site by URL", NULL, dmenuSetVariable, NULL, VAR_FTP_PATH "=other" }, { "3.0 SNAP Server", "current.freebsd.org", NULL, dmenuSetVariable, NULL, - VAR_FTP_PATH "=ftp://ftp.freebsd.org/pub/FreeBSD/" }, + VAR_FTP_PATH "=ftp://current.freebsd.org/pub/FreeBSD/" }, { "2.2 SNAP Server", "releng22.freebsd.org", NULL, dmenuSetVariable, NULL, - VAR_FTP_PATH "=ftp://ftp.freebsd.org/pub/FreeBSD/" }, + VAR_FTP_PATH "=ftp://releng22.freebsd.org/pub/FreeBSD/" }, { "2.1 SNAP Server", "releng210.freebsd.org", NULL, dmenuSetVariable, NULL, - VAR_FTP_PATH "=ftp://ftp.freebsd.org/pub/FreeBSD/" }, + VAR_FTP_PATH "=ftp://releng210.freebsd.org/pub/FreeBSD/" }, { "Argentina", "ftp.ar.freebsd.org", NULL, dmenuSetVariable, NULL, VAR_FTP_PATH "=ftp://ftp.ar.freebsd.org/pub/FreeBSD/" }, { "Australia", "ftp.au.freebsd.org", NULL, dmenuSetVariable, NULL, diff --git a/usr.sbin/sysinstall/config.c b/usr.sbin/sysinstall/config.c index 51c51c8..43bfeba 100644 --- a/usr.sbin/sysinstall/config.c +++ b/usr.sbin/sysinstall/config.c @@ -4,7 +4,7 @@ * This is probably the last program in the `sysinstall' line - the next * generation being essentially a complete rewrite. * - * $Id: config.c,v 1.94 1997/05/26 04:57:56 jkh Exp $ + * $Id: config.c,v 1.95 1997/05/26 05:33:16 jkh Exp $ * * Copyright (c) 1995 * Jordan Hubbard. All rights reserved. @@ -583,6 +583,8 @@ configXFree86(dialogMenuItem *self) "to it will actually be /cdrom/CDE/dtinstall when you run it later).\n"); } else { + if (file_readable("/dist/CDE/post-install")) + systemExecute("/dist/CDE/post-install"); /* Repair the damage done by the CDE installation */ msgNotify("Doing final adjustments to Xaccel distribution..."); systemExecute("/usr/X11R6/lib/X11/AcceleratedX/bin/Xinstall"); diff --git a/usr.sbin/sysinstall/menus.c b/usr.sbin/sysinstall/menus.c index ca6dc60f..546e928 100644 --- a/usr.sbin/sysinstall/menus.c +++ b/usr.sbin/sysinstall/menus.c @@ -4,7 +4,7 @@ * This is probably the last program in the `sysinstall' line - the next * generation being essentially a complete rewrite. * - * $Id: menus.c,v 1.134 1997/05/22 21:26:10 jkh Exp $ + * $Id: menus.c,v 1.135 1997/05/23 18:54:29 jkh Exp $ * * Copyright (c) 1995 * Jordan Hubbard. All rights reserved. @@ -468,11 +468,11 @@ DMenu MenuMediaFTP = { { "URL", "Specify some other ftp site by URL", NULL, dmenuSetVariable, NULL, VAR_FTP_PATH "=other" }, { "3.0 SNAP Server", "current.freebsd.org", NULL, dmenuSetVariable, NULL, - VAR_FTP_PATH "=ftp://ftp.freebsd.org/pub/FreeBSD/" }, + VAR_FTP_PATH "=ftp://current.freebsd.org/pub/FreeBSD/" }, { "2.2 SNAP Server", "releng22.freebsd.org", NULL, dmenuSetVariable, NULL, - VAR_FTP_PATH "=ftp://ftp.freebsd.org/pub/FreeBSD/" }, + VAR_FTP_PATH "=ftp://releng22.freebsd.org/pub/FreeBSD/" }, { "2.1 SNAP Server", "releng210.freebsd.org", NULL, dmenuSetVariable, NULL, - VAR_FTP_PATH "=ftp://ftp.freebsd.org/pub/FreeBSD/" }, + VAR_FTP_PATH "=ftp://releng210.freebsd.org/pub/FreeBSD/" }, { "Argentina", "ftp.ar.freebsd.org", NULL, dmenuSetVariable, NULL, VAR_FTP_PATH "=ftp://ftp.ar.freebsd.org/pub/FreeBSD/" }, { "Australia", "ftp.au.freebsd.org", NULL, dmenuSetVariable, NULL, -- cgit v1.1