diff options
28 files changed, 415 insertions, 96 deletions
diff --git a/release/sysinstall/Makefile b/release/sysinstall/Makefile index 0a2440f..0774972 100644 --- a/release/sysinstall/Makefile +++ b/release/sysinstall/Makefile @@ -17,6 +17,7 @@ SRCS= anonFTP.c apache.c attr.c cdrom.c command.c config.c devices.c \ CFLAGS+= -Wall -I${.CURDIR}/../../gnu/lib/libdialog -I${.OBJDIR} -I/sys CFLAGS+= -DUC_PRIVATE -DKERN_NO_SYMBOLS -DSAVE_USERCONFIG +#CFLAGS+= -DUSE_XIG_ENVIRONMENT .if defined(LOAD_CONFIG_FILE) CFLAGS+= -DLOAD_CONFIG_FILE=\"${LOAD_CONFIG_FILE}\" diff --git a/release/sysinstall/config.c b/release/sysinstall/config.c index f551a18..3cb6625 100644 --- a/release/sysinstall/config.c +++ b/release/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.85 1997/03/09 22:25:42 jkh Exp $ + * $Id: config.c,v 1.86 1997/03/12 02:31:28 jkh Exp $ * * Copyright (c) 1995 * Jordan Hubbard. All rights reserved. @@ -480,10 +480,57 @@ configUsers(dialogMenuItem *self) int configXFree86(dialogMenuItem *self) { +#ifndef USE_XIG_ENVIRONMENT char *config, *execfile; dialog_clear_norefresh(); - dmenuOpenSimple(&MenuXF86Config, FALSE); + if (!dmenuOpenSimple(&MenuXF86Config, FALSE)) + return DITEM_FAILURE | DITEM_RESTORE; +#endif + systemExecute("/sbin/ldconfig /usr/lib /usr/X11R6/lib /usr/local/lib /usr/lib/compat"); +#ifdef USE_XIG_ENVIRONMENT + if (!file_readable("/usr/X11R6/lib/X11/AcceleratedX/bin/Xinstall") || + !file_readable("/usr/X11R6/lib/X11/AcceleratedX/bin/Xsetup")) { + dialog_clear_norefresh(); + msgConfirm("Hmmm! It looks like you elected not to install the AccelleratedX\n" + "server package (or the installation failed somehow). If this was\n" + "an omission rather than an error, please go to the Distributions\n" + "menu, select the Custom distribution options and then choose your X11\n" + "distribution components from the XFree86 menu. AccelX will be selected\n" + "as the default server automatically."); + return DITEM_FAILURE | DITEM_RESTORE; + } + else { + int i; + + if (directory_exists("/dist/CDE") && !msgYesNo("Would you like to install the CDE desktop package now?")) { + dialog_clear_norefresh(); + msgNotify("Running CDE installation - please wait (this may take awhile!)."); + dialog_clear(); + i = systemExecute("(cd /dist/CDE; sh Install)"); + dialog_clear(); + if (i) { + msgConfirm("/dist/CDE/dtinstall script returned an error status!\n\n" + "To try again, you should run this command manually after the system\n" + "is up (and if your CDROM is mounted in the standard location, the path\n" + "to it will actually be /cdrom/CDE/dtinstall when you run it later).\n"); + } + } + + dialog_clear_norefresh(); + msgNotify("Running AcceleratedX 3.1 installation procedure, please wait."); + if ((i = vsystem("/usr/X11R6/lib/X11/AcceleratedX/bin/Xinstall"))) { + msgConfirm("Installation procedure failed, error code %d! Please report\n" + "error to Walnut Creek CDROM tech support (either send email\n" + "to support@cdrom.com or call +1 510 603 1234). Thank you!", i); + return DITEM_FAILURE | DITEM_RESTORE; + } + dialog_clear(); + systemExecute("/usr/X11R6/lib/X11/AcceleratedX/bin/Xsetup"); + return DITEM_SUCCESS | DITEM_RESTORE; + } + +#else /* !USE_XIG_ENVIRONMENT */ config = variable_get(VAR_XF86_CONFIG); if (!config) @@ -494,7 +541,6 @@ configXFree86(dialogMenuItem *self) if (!file_readable("/dev/mouse") && !msgYesNo("Does this system have a mouse attached to it?")) dmenuOpenSimple(&MenuMouse, FALSE); dialog_clear(); - systemExecute("/sbin/ldconfig /usr/lib /usr/X11R6/lib /usr/local/lib /usr/lib/compat"); systemExecute(execfile); return DITEM_SUCCESS | DITEM_RESTORE; } @@ -502,8 +548,9 @@ configXFree86(dialogMenuItem *self) dialog_clear_norefresh(); msgConfirm("XFree86 does not appear to be installed! Please install\n" "The XFree86 distribution before attempting to configure it."); - return DITEM_FAILURE; + return DITEM_FAILURE | DITEM_RESTORE; } +#endif /* USE_XIG_ENVIRONMENT */ } void diff --git a/release/sysinstall/disks.c b/release/sysinstall/disks.c index 32c1ab6..a6e552c 100644 --- a/release/sysinstall/disks.c +++ b/release/sysinstall/disks.c @@ -4,7 +4,7 @@ * This is probably the last program in the `sysinstall' line - the next * generation being essentially a complete rewrite. * - * $Id$ + * $Id: disks.c,v 1.82 1997/03/11 16:27:25 joerg Exp $ * * Copyright (c) 1995 * Jordan Hubbard. All rights reserved. @@ -85,8 +85,8 @@ print_chunks(Disk *d) "the Hardware Guide in the Documentation submenu or use the\n" "(G)eometry command to change it now.\n\n" "Remember: you need to enter whatever your BIOS thinks the\n" - "geometry were! For IDE, that's what you have told in the BIOS\n" - "setup, for SCSI, it's the translation mode your controller is\n" + "geometry is! For IDE, it's what you were told in the BIOS\n" + "setup. For SCSI, it's the translation mode your controller is\n" "using. Do NOT use a ``physical geometry''.", d->bios_cyl, d->bios_hd, d->bios_sect, d->name); Sanitize_Bios_Geom(d); diff --git a/release/sysinstall/dist.c b/release/sysinstall/dist.c index ec6ac3a..4cafbbc 100644 --- a/release/sysinstall/dist.c +++ b/release/sysinstall/dist.c @@ -4,7 +4,7 @@ * This is probably the last program in the `sysinstall' line - the next * generation being essentially a complete rewrite. * - * $Id: dist.c,v 1.73.2.23 1997/03/25 02:45:37 jkh Exp $ + * $Id: dist.c,v 1.105 1997/04/02 12:07:27 jkh Exp $ * * Copyright (c) 1995 * Jordan Hubbard. All rights reserved. @@ -41,9 +41,11 @@ unsigned int Dists; unsigned int DESDists; unsigned int SrcDists; +#ifndef USE_XIG_ENVIRONMENT unsigned int XF86Dists; unsigned int XF86ServerDists; unsigned int XF86FontDists; +#endif typedef struct _dist { char *my_name; @@ -56,9 +58,11 @@ typedef struct _dist { extern Distribution DistTable[]; extern Distribution DESDistTable[]; extern Distribution SrcDistTable[]; +#ifndef USE_XIG_ENVIRONMENT extern Distribution XF86DistTable[]; extern Distribution XF86FontDistTable[]; extern Distribution XF86ServerDistTable[]; +#endif /* The top-level distribution categories */ static Distribution DistTable[] = { @@ -76,7 +80,11 @@ static Distribution DistTable[] = { { "compat20", "/", &Dists, DIST_COMPAT20, NULL }, { "compat21", "/", &Dists, DIST_COMPAT21, NULL }, { "ports", "/usr", &Dists, DIST_PORTS, NULL }, +#ifdef USE_XIG_ENVIRONMENT +{ "accelx", "/usr/X11R6/lib/X11", &Dists, DIST_XIG_SERVER, NULL }, +#else { "XF8632", "/usr", &Dists, DIST_XF86, XF86DistTable }, +#endif { NULL }, }; @@ -111,6 +119,7 @@ static Distribution SrcDistTable[] = { { NULL }, }; +#ifndef USE_XIG_ENVIRONMENT /* The XFree86 distribution */ static Distribution XF86DistTable[] = { { "XF8632", "/usr/X11R6", &XF86Dists, DIST_XF86_FONTS, XF86FontDistTable }, @@ -173,6 +182,7 @@ static Distribution XF86FontDistTable[] = { { "X32fsrv", "/usr/X11R6", &XF86FontDists, DIST_XF86_FONTS_SERVER, NULL }, { NULL }, }; +#endif /* !USE_XIG_ENVIRONMENT */ static int distMaybeSetDES(dialogMenuItem *self); static int distMaybeSetPorts(dialogMenuItem *self); @@ -183,9 +193,11 @@ distReset(dialogMenuItem *self) Dists = 0; DESDists = 0; SrcDists = 0; +#ifndef USE_XIG_ENVIRONMENT XF86Dists = 0; XF86ServerDists = 0; XF86FontDists = 0; +#endif return DITEM_SUCCESS | DITEM_REDRAW; } @@ -204,9 +216,13 @@ distSetXDeveloper(dialogMenuItem *self) distReset(NULL); Dists = _DIST_DEVELOPER; SrcDists = DIST_SRC_ALL; +#ifdef USE_XIG_ENVIRONMENT + Dists |= (DIST_XIG_SERVER | DIST_COMPAT21); +#else XF86Dists = DIST_XF86_BIN | DIST_COMPAT21 | DIST_XF86_SET | DIST_XF86_CFG | DIST_XF86_LIB | DIST_XF86_PROG | DIST_XF86_MAN | DIST_XF86_SERVER | DIST_XF86_FONTS; XF86ServerDists = DIST_XF86_SERVER_SVGA | DIST_XF86_SERVER_VGA16; XF86FontDists = DIST_XF86_FONTS_MISC; +#endif return distSetXF86(NULL) | distMaybeSetDES(self) | distMaybeSetPorts(self); } @@ -232,9 +248,13 @@ distSetXUser(dialogMenuItem *self) { distReset(NULL); Dists = _DIST_USER; - XF86Dists = DIST_XF86_BIN | DIST_COMPAT21 | DIST_XF86_SET | DIST_XF86_CFG | DIST_XF86_LIB | DIST_XF86_MAN | DIST_XF86_SERVER | DIST_XF86_FONTS; +#ifdef USE_XIG_ENVIRONMENT + Dists |= (DIST_XIG_SERVER | DIST_COMPAT21); +#else XF86ServerDists = DIST_XF86_SERVER_SVGA | DIST_XF86_SERVER_VGA16; + XF86Dists = DIST_XF86_BIN | DIST_COMPAT21 | DIST_XF86_SET | DIST_XF86_CFG | DIST_XF86_LIB | DIST_XF86_MAN | DIST_XF86_SERVER | DIST_XF86_FONTS; XF86FontDists = DIST_XF86_FONTS_MISC; +#endif return distSetXF86(NULL) | distMaybeSetDES(self) | distMaybeSetPorts(self); } @@ -251,9 +271,13 @@ distSetEverything(dialogMenuItem *self) { Dists = DIST_ALL; SrcDists = DIST_SRC_ALL; +#ifdef USE_XIG_ENVIRONMENT + Dists |= (DIST_XIG_SERVER | DIST_COMPAT21); +#else XF86Dists = DIST_XF86_ALL; XF86ServerDists = DIST_XF86_SERVER_ALL; XF86FontDists = DIST_XF86_FONTS_ALL; +#endif return distMaybeSetDES(self) | distMaybeSetPorts(self); } @@ -347,6 +371,9 @@ distSetXF86(dialogMenuItem *self) { int i = DITEM_SUCCESS; +#ifdef USE_XIG_ENVIRONMENT + Dists |= (DIST_XIG_SERVER | DIST_COMPAT21); +#else if (dmenuOpenSimple(&MenuXF86Select, FALSE)) { if (XF86ServerDists) XF86Dists |= DIST_XF86_SERVER; @@ -354,11 +381,13 @@ distSetXF86(dialogMenuItem *self) XF86Dists |= DIST_XF86_FONTS; if (XF86Dists) Dists |= (DIST_XF86 | DIST_COMPAT21); - msgDebug("SetXF86 Masks: Server: %0x, Fonts: %0x, XDists: %0x, Dists: %0x\n", - XF86ServerDists, XF86FontDists, XF86Dists, Dists); + if (isDebug()) + msgDebug("SetXF86 Masks: Server: %0x, Fonts: %0x, XDists: %0x, Dists: %0x\n", + XF86ServerDists, XF86FontDists, XF86Dists, Dists); } else i = DITEM_FAILURE; +#endif return i | DITEM_RECREATE; } diff --git a/release/sysinstall/dist.h b/release/sysinstall/dist.h index bf81f70..95e2d2b 100644 --- a/release/sysinstall/dist.h +++ b/release/sysinstall/dist.h @@ -17,6 +17,11 @@ #define DIST_DES 0x1000 #define DIST_CATPAGES 0x2000 #define DIST_PORTS 0x4000 +#ifdef USE_XIG_ENVIRONMENT +#define DIST_XIG_SERVER 0x8000 +#else +#define DIST_USR1 0x8000 +#endif #define DIST_ALL 0x7FFF /* Canned distribution sets */ @@ -52,6 +57,7 @@ #define DIST_SRC_SMAILCF 0x10000 #define DIST_SRC_ALL 0xFFFF /* no SMAILCF, it's part of USBIN */ +#ifndef USE_XIG_ENVIRONMENT /* Subtypes for XFree86 distribution */ #define DIST_XF86_BIN 0x0001 #define DIST_XF86_CFG 0x0002 @@ -105,6 +111,6 @@ #define DIST_XF86_FONTS_SERVER 0x0020 #define DIST_XF86_FONTS_ALL 0x003F #define DIST_XF86_ALL 0x1FFFF +#endif /* !USE_XIG_ENVIRONMENT */ -#endif -/* _DIST_H_INCLUDE */ +#endif /* _DIST_H_INCLUDE */ diff --git a/release/sysinstall/globals.c b/release/sysinstall/globals.c index f96ad5a..72aecb1 100644 --- a/release/sysinstall/globals.c +++ b/release/sysinstall/globals.c @@ -4,7 +4,7 @@ * This is probably the last program in the `sysinstall' line - the next * generation being essentially a complete rewrite. * - * $Id$ + * $Id: globals.c,v 1.18 1997/02/22 14:11:43 peter Exp $ * * Copyright (c) 1995 * Jordan Hubbard. All rights reserved. @@ -51,6 +51,7 @@ Variable *VarHead; /* The head of the variable chain */ Device *mediaDevice; /* Where we're installing from */ int BootMgr; /* Which boot manager we're using */ int StatusLine; /* Where to stick our status messages */ +jmp_buf BailOut; /* Beam me up, scotty! The natives are pissed! */ /* * Yes, I know some of these are already automatically initialized as diff --git a/release/sysinstall/main.c b/release/sysinstall/main.c index 2f1f3a2..c267838 100644 --- a/release/sysinstall/main.c +++ b/release/sysinstall/main.c @@ -4,7 +4,7 @@ * This is probably the last attempt in the `sysinstall' line, the next * generation being slated for what's essentially a complete rewrite. * - * $Id: main.c,v 1.43 1997/02/22 14:11:55 peter Exp $ + * $Id: main.c,v 1.44 1997/03/19 10:09:17 jkh Exp $ * * Copyright (c) 1995 * Jordan Hubbard. All rights reserved. @@ -42,12 +42,13 @@ static void screech(int sig) { msgDebug("\007Signal %d caught! That's bad!\n", sig); + longjmp(BailOut, sig); } int main(int argc, char **argv) { - int choice, scroll, curr, max; + int choice, scroll, curr, max, status; /* Catch fatal signals and complain about them if running as init */ if (getpid() == 1) { @@ -119,7 +120,17 @@ main(int argc, char **argv) fclose(fp); } } - + + status = setjmp(BailOut); + if (status) { + msgConfirm("A signal %d was caught - I'm saving what I can and shutting\n" + "this thing down! Please report this unfortunate incident\n" + "to jkh@FreeBSD.org. If you can reproduce the problem, please\n" + "also turn Debug on in the Options menu for the extra information\n" + "it provides in debugging problems like this. Thanks!", status); + systemShutdown(status); + } + /* Begin user dialog at outer menu */ dialog_clear(); while (1) { diff --git a/release/sysinstall/menus.c b/release/sysinstall/menus.c index c5c573c..a3b0956 100644 --- a/release/sysinstall/menus.c +++ b/release/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.129 1997/03/25 03:07:39 jkh Exp $ + * $Id: menus.c,v 1.130 1997/03/27 01:44:11 jkh Exp $ * * Copyright (c) 1995 * Jordan Hubbard. All rights reserved. @@ -53,6 +53,7 @@ clearSrc(dialogMenuItem *self) return DITEM_SUCCESS | DITEM_REDRAW; } +#ifndef USE_XIG_ENVIRONMENT static int setX11All(dialogMenuItem *self) { @@ -121,6 +122,7 @@ clearX11Fonts(dialogMenuItem *self) XF86FontDists = 0; return DITEM_SUCCESS | DITEM_REDRAW; } +#endif /* !USE_XIG_ENVIRONMENT */ #define IS_DEVELOPER(dist, extra) ((((dist) & (_DIST_DEVELOPER | (extra))) == (_DIST_DEVELOPER | (extra))) || \ (((dist) & (_DIST_DEVELOPER | DIST_DES | (extra))) == (_DIST_DEVELOPER | DIST_DES | (extra)))) @@ -166,8 +168,12 @@ checkDistMinimum(dialogMenuItem *self) static int checkDistEverything(dialogMenuItem *self) { +#ifdef USE_XIG_ENVIRONMENT + return (Dists == DIST_ALL && SrcDists == DIST_SRC_ALL); +#else return (Dists == DIST_ALL && SrcDists == DIST_SRC_ALL && XF86Dists == DIST_XF86_ALL && XF86ServerDists == DIST_XF86_SERVER_ALL && XF86FontDists == DIST_XF86_FONTS_ALL); +#endif } static int @@ -182,11 +188,13 @@ srcFlagCheck(dialogMenuItem *item) return SrcDists; } +#ifndef USE_XIG_ENVIRONMENT static int x11FlagCheck(dialogMenuItem *item) { return XF86Dists; } +#endif static int checkTrue(dialogMenuItem *item) @@ -225,7 +233,9 @@ DMenu MenuIndex = { { "Dists, User", "Select average user distribution.", checkDistUser, distSetUser }, { "Dists, X User", "Select average X user distribution.", checkDistXUser, distSetXUser }, { "Distributions, Adding", "Installing additional distribution sets", NULL, distExtractAll }, +#ifndef USE_XIG_ENVIRONMENT { "Distributions, XFree86","XFree86 distribution menu.", NULL, distSetXF86 }, +#endif { "Documentation", "Installation instructions, README, etc.", NULL, dmenuSubmenu, NULL, &MenuDocumentation }, { "Doc, README", "The distribution README file.", NULL, dmenuDisplayFile, NULL, "readme" }, { "Doc, Hardware", "The distribution hardware guide.", NULL, dmenuDisplayFile, NULL, "hardware" }, @@ -276,9 +286,11 @@ DMenu MenuIndex = { { "Usage", "Quick start - How to use this menu system.", NULL, dmenuDisplayFile, NULL, "usage" }, { "User Management", "Add user and group information.", NULL, dmenuSubmenu, NULL, &MenuUsermgmt }, { "WEB Server", "Configure host as a WWW server.", dmenuVarCheck, configApache, NULL, "apache_httpd" }, +#ifndef USE_XIG_ENVIRONMENT { "XFree86, Fonts", "XFree86 Font selection menu.", NULL, dmenuSubmenu, NULL, &MenuXF86SelectFonts }, { "XFree86, Server", "XFree86 Server selection menu.", NULL, dmenuSubmenu, NULL, &MenuXF86SelectServer }, { "XFree86, PC98 Server", "XFree86 PC98 Server selection menu.", NULL, dmenuSubmenu, NULL, &MenuXF86SelectPC98Server }, +#endif { NULL } }, }; @@ -363,7 +375,7 @@ DMenu MenuMouse = { "There are many different types of mice currently on the market,\n" "but this configuration menu should at least narrow down the choices\n" "somewhat. Once you've selected one of the below, you can specify\n" - "/dev/mouse as your mouse device when running the XFree86 configuration\n" + "/dev/mouse as your mouse device when running the X configuration\n" "utility (see Configuration menu). Please note that for PS/2 mice,\n" "you need to enable the psm driver in the kernel configuration menu\n" "when installing for the first time.", @@ -384,6 +396,7 @@ DMenu MenuMouse = { { NULL } }, }; +#ifndef USE_XIG_ENVIRONMENT DMenu MenuXF86Config = { DMENU_NORMAL_TYPE | DMENU_SELECTION_RETURNS, "Please select the XFree86 configuration tool you want to use.", @@ -402,6 +415,7 @@ DMenu MenuXF86Config = { NULL, dmenuSetVariable, NULL, VAR_XF86_CONFIG "=xf86config" }, { NULL } }, }; +#endif DMenu MenuMediaCDROM = { DMENU_NORMAL_TYPE | DMENU_SELECTION_RETURNS, @@ -656,19 +670,19 @@ DMenu MenuDistributions = { "distributions", { { "1 Developer", "Full sources, binaries and doc but no games", checkDistDeveloper, distSetDeveloper }, - { "2 X-Developer", "Same as above, but includes XFree86", + { "2 X-Developer", "Same as above, but includes the X Window System", checkDistXDeveloper, distSetXDeveloper }, { "3 Kern-Developer", "Full binaries and doc, kernel sources only", checkDistKernDeveloper, distSetKernDeveloper }, { "4 User", "Average user - binaries and doc only", checkDistUser, distSetUser }, - { "5 X-User", "Same as above, but includes XFree86", + { "5 X-User", "Same as above, but includes the X Window System", checkDistXUser, distSetXUser }, { "6 Minimal", "The smallest configuration possible", checkDistMinimum, distSetMinimum }, { "7 Custom", "Specify your own distribution set", NULL, dmenuSubmenu, NULL, &MenuSubDistributions, '>', '>', '>' }, - { "8 All", "All sources, binaries and XFree86 binaries", + { "8 All", "All sources and binaries (incl X Window System)", checkDistEverything, distSetEverything }, { "9 Clear", "Reset selected distribution list to nothing", NULL, distReset, NULL, NULL, ' ', ' ', ' ' }, @@ -713,9 +727,11 @@ DMenu MenuSubDistributions = { srcFlagCheck, distSetSrc }, { "ports", "The FreeBSD Ports collection", dmenuFlagCheck, dmenuSetFlag, NULL, &Dists, '[', 'X', ']', DIST_PORTS }, +#ifndef USE_XIG_ENVIRONMENT { "XFree86", "The XFree86 3.2 distribution", x11FlagCheck, distSetXF86 }, - { "All", "All sources, binaries and XFree86 binaries", +#endif + { "All", "All sources, binaries and X Window System binaries", NULL, distSetEverything, NULL, NULL, ' ', ' ', ' ' }, { "Clear", "Reset all of the above", NULL, distReset, NULL, NULL, ' ', ' ', ' ' }, @@ -796,18 +812,18 @@ DMenu MenuSrcDistributions = { { NULL } }, }; +#ifndef USE_XIG_ENVIRONMENT DMenu MenuXF86Select = { DMENU_NORMAL_TYPE, "XFree86 3.2 Distribution", "Please select the components you need from the XFree86 3.2\n" - "distribution. We recommend that you select what you need from the basic\n" - "component set and at least one entry from the Server and Font set menus.", + "distribution sets.", "Press F1 to read the XFree86 release notes for FreeBSD", "XF86", { { "Basic", "Basic component menu (required)", NULL, dmenuSubmenu, NULL, &MenuXF86SelectCore }, { "Server", "X server menu", NULL, dmenuSubmenu, NULL, &MenuXF86SelectServer }, { "Fonts", "Font set menu", NULL, dmenuSubmenu, NULL, &MenuXF86SelectFonts }, - { "All", "Select the entire XFree86 distribution", NULL, setX11All }, + { "All", "Select all XFree86 distribution sets", NULL, setX11All }, { "Clear", "Reset XFree86 distribution list", NULL, clearX11All }, { "Exit", "Exit this menu (returning to previous)", checkTrue, dmenuExit, NULL, NULL, '<', '<', '<' }, { NULL } }, @@ -830,18 +846,22 @@ DMenu MenuXF86SelectCore = { dmenuFlagCheck, dmenuSetFlag, NULL, &XF86Dists, '[', 'X', ']', DIST_XF86_HTML }, { "lib", "Data files needed at runtime", dmenuFlagCheck, dmenuSetFlag, NULL, &XF86Dists, '[', 'X', ']', DIST_XF86_LIB }, +#ifndef USE_XIG_ENVIRONMENT { "lk98", "Server link kit for PC98 machines", dmenuFlagCheck, dmenuSetFlag, NULL, &XF86Dists, '[', 'X', ']', DIST_XF86_LKIT98 }, { "lkit", "Server link kit for all other machines", dmenuFlagCheck, dmenuSetFlag, NULL, &XF86Dists, '[', 'X', ']', DIST_XF86_LKIT }, +#endif { "man", "Manual pages", dmenuFlagCheck, dmenuSetFlag, NULL, &XF86Dists, '[', 'X', ']', DIST_XF86_MAN }, { "prog", "Programmer's header and library files", dmenuFlagCheck, dmenuSetFlag, NULL, &XF86Dists, '[', 'X', ']', DIST_XF86_PROG }, { "ps", "Postscript documentation", dmenuFlagCheck, dmenuSetFlag, NULL, &XF86Dists, '[', 'X', ']', DIST_XF86_PS }, +#ifndef USE_XIG_ENVIRONMENT { "set", "XFree86 Setup Utility", dmenuFlagCheck, dmenuSetFlag, NULL, &XF86Dists, '[', 'X', ']', DIST_XF86_SET }, +#endif { "sources", "XFree86 3.2 standard sources", dmenuFlagCheck, dmenuSetFlag, NULL, &XF86Dists, '[', 'X', ']', DIST_XF86_SRC }, { "csources", "XFree86 3.2 contrib sources", @@ -972,7 +992,7 @@ Mono servers are particularly well-suited to most LCD displays).", checkTrue, dmenuExit, NULL, NULL, '<', '<', '<' }, { NULL } } }; - +#endif /* !USE_XIG_ENVIRONMENT */ DMenu MenuDiskDevices = { DMENU_CHECKLIST_TYPE | DMENU_SELECTION_RETURNS, @@ -1077,7 +1097,11 @@ DMenu MenuConfigure = { NULL, dmenuSystemCommand, NULL, "passwd root" }, { "A HTML Docs", "Go to the HTML documentation menu (post-install)", NULL, docBrowser }, +#ifdef USE_XIG_ENVIRONMENT + { "X X + CDE", "Configure X Window system & CDE environment", +#else { "X XFree86", "Configure XFree86", +#endif NULL, configXFree86 }, { "D Distributions", "Install additional distribution sets", NULL, distExtractAll }, diff --git a/release/sysinstall/msg.c b/release/sysinstall/msg.c index 76707c6..fe49f2f 100644 --- a/release/sysinstall/msg.c +++ b/release/sysinstall/msg.c @@ -4,7 +4,7 @@ * This is probably the last program in the `sysinstall' line - the next * generation being essentially a complete rewrite. * - * $Id$ + * $Id: msg.c,v 1.44 1997/02/22 14:12:10 peter Exp $ * * Copyright (c) 1995 * Jordan Hubbard. All rights reserved. @@ -192,7 +192,6 @@ msgConfirm(char *fmt, ...) use_helpline(NULL); use_helpfile(NULL); if (OnVTY) { - msgDebug("Switching back to VTY1\n"); ioctl(0, VT_ACTIVATE, 1); msgInfo(NULL); } @@ -233,7 +232,6 @@ msgYesNo(char *fmt, ...) use_helpline(NULL); use_helpfile(NULL); if (OnVTY) { - msgDebug("Switching back to VTY1\n"); ioctl(0, VT_ACTIVATE, 1); /* Switch back */ msgInfo(NULL); } @@ -261,7 +259,6 @@ msgGetInput(char *buf, char *fmt, ...) else input_buffer[0] = '\0'; if (OnVTY) { - msgDebug("Switching back to VTY1\n"); ioctl(0, VT_ACTIVATE, 1); /* Switch back */ msgInfo(NULL); } diff --git a/release/sysinstall/sysinstall.h b/release/sysinstall/sysinstall.h index bd7e775..9aa9320 100644 --- a/release/sysinstall/sysinstall.h +++ b/release/sysinstall/sysinstall.h @@ -4,7 +4,7 @@ * This is probably the last attempt in the `sysinstall' line, the next * generation being slated to essentially a complete rewrite. * - * $Id: sysinstall.h,v 1.122 1997/03/19 10:09:26 jkh Exp $ + * $Id: sysinstall.h,v 1.123 1997/04/02 12:07:39 jkh Exp $ * * Copyright (c) 1995 * Jordan Hubbard. All rights reserved. @@ -39,6 +39,7 @@ #include <sys/types.h> #include <sys/wait.h> +#include <setjmp.h> #include <stdio.h> #include <stdlib.h> #include <string.h> @@ -55,11 +56,11 @@ /* Different packages we depend on - update this when package version change! */ #define PACKAGE_GATED "gated-3.5b3" -#define PACKAGE_APACHE "apache-1.2b7" +#define PACKAGE_APACHE "apache-1.2b8" #define PACKAGE_NETCON "commerce/netcon/bsd61" #define PACKAGE_PCNFSD "pcnfsd-93.02.16" #define PACKAGE_SAMBA "samba-1.9.15p8" -#define PACKAGE_LYNX "lynx-2.7" +#define PACKAGE_LYNX "lynx-2.7.1" /* device limits */ #define DEV_NAME_MAX 64 /* The maximum length of a device name */ @@ -314,6 +315,7 @@ typedef struct _devPriv { /*** Externs ***/ +extern jmp_buf BailOut; /* Used to get the heck out */ extern int DebugFD; /* Where diagnostic output goes */ extern Boolean Fake; /* Don't actually modify anything - testing */ extern Boolean SystemWasInstalled; /* Did we install it? */ diff --git a/usr.sbin/sade/Makefile b/usr.sbin/sade/Makefile index 0a2440f..0774972 100644 --- a/usr.sbin/sade/Makefile +++ b/usr.sbin/sade/Makefile @@ -17,6 +17,7 @@ SRCS= anonFTP.c apache.c attr.c cdrom.c command.c config.c devices.c \ CFLAGS+= -Wall -I${.CURDIR}/../../gnu/lib/libdialog -I${.OBJDIR} -I/sys CFLAGS+= -DUC_PRIVATE -DKERN_NO_SYMBOLS -DSAVE_USERCONFIG +#CFLAGS+= -DUSE_XIG_ENVIRONMENT .if defined(LOAD_CONFIG_FILE) CFLAGS+= -DLOAD_CONFIG_FILE=\"${LOAD_CONFIG_FILE}\" diff --git a/usr.sbin/sade/config.c b/usr.sbin/sade/config.c index f551a18..3cb6625 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.85 1997/03/09 22:25:42 jkh Exp $ + * $Id: config.c,v 1.86 1997/03/12 02:31:28 jkh Exp $ * * Copyright (c) 1995 * Jordan Hubbard. All rights reserved. @@ -480,10 +480,57 @@ configUsers(dialogMenuItem *self) int configXFree86(dialogMenuItem *self) { +#ifndef USE_XIG_ENVIRONMENT char *config, *execfile; dialog_clear_norefresh(); - dmenuOpenSimple(&MenuXF86Config, FALSE); + if (!dmenuOpenSimple(&MenuXF86Config, FALSE)) + return DITEM_FAILURE | DITEM_RESTORE; +#endif + systemExecute("/sbin/ldconfig /usr/lib /usr/X11R6/lib /usr/local/lib /usr/lib/compat"); +#ifdef USE_XIG_ENVIRONMENT + if (!file_readable("/usr/X11R6/lib/X11/AcceleratedX/bin/Xinstall") || + !file_readable("/usr/X11R6/lib/X11/AcceleratedX/bin/Xsetup")) { + dialog_clear_norefresh(); + msgConfirm("Hmmm! It looks like you elected not to install the AccelleratedX\n" + "server package (or the installation failed somehow). If this was\n" + "an omission rather than an error, please go to the Distributions\n" + "menu, select the Custom distribution options and then choose your X11\n" + "distribution components from the XFree86 menu. AccelX will be selected\n" + "as the default server automatically."); + return DITEM_FAILURE | DITEM_RESTORE; + } + else { + int i; + + if (directory_exists("/dist/CDE") && !msgYesNo("Would you like to install the CDE desktop package now?")) { + dialog_clear_norefresh(); + msgNotify("Running CDE installation - please wait (this may take awhile!)."); + dialog_clear(); + i = systemExecute("(cd /dist/CDE; sh Install)"); + dialog_clear(); + if (i) { + msgConfirm("/dist/CDE/dtinstall script returned an error status!\n\n" + "To try again, you should run this command manually after the system\n" + "is up (and if your CDROM is mounted in the standard location, the path\n" + "to it will actually be /cdrom/CDE/dtinstall when you run it later).\n"); + } + } + + dialog_clear_norefresh(); + msgNotify("Running AcceleratedX 3.1 installation procedure, please wait."); + if ((i = vsystem("/usr/X11R6/lib/X11/AcceleratedX/bin/Xinstall"))) { + msgConfirm("Installation procedure failed, error code %d! Please report\n" + "error to Walnut Creek CDROM tech support (either send email\n" + "to support@cdrom.com or call +1 510 603 1234). Thank you!", i); + return DITEM_FAILURE | DITEM_RESTORE; + } + dialog_clear(); + systemExecute("/usr/X11R6/lib/X11/AcceleratedX/bin/Xsetup"); + return DITEM_SUCCESS | DITEM_RESTORE; + } + +#else /* !USE_XIG_ENVIRONMENT */ config = variable_get(VAR_XF86_CONFIG); if (!config) @@ -494,7 +541,6 @@ configXFree86(dialogMenuItem *self) if (!file_readable("/dev/mouse") && !msgYesNo("Does this system have a mouse attached to it?")) dmenuOpenSimple(&MenuMouse, FALSE); dialog_clear(); - systemExecute("/sbin/ldconfig /usr/lib /usr/X11R6/lib /usr/local/lib /usr/lib/compat"); systemExecute(execfile); return DITEM_SUCCESS | DITEM_RESTORE; } @@ -502,8 +548,9 @@ configXFree86(dialogMenuItem *self) dialog_clear_norefresh(); msgConfirm("XFree86 does not appear to be installed! Please install\n" "The XFree86 distribution before attempting to configure it."); - return DITEM_FAILURE; + return DITEM_FAILURE | DITEM_RESTORE; } +#endif /* USE_XIG_ENVIRONMENT */ } void diff --git a/usr.sbin/sade/disks.c b/usr.sbin/sade/disks.c index 32c1ab6..a6e552c 100644 --- a/usr.sbin/sade/disks.c +++ b/usr.sbin/sade/disks.c @@ -4,7 +4,7 @@ * This is probably the last program in the `sysinstall' line - the next * generation being essentially a complete rewrite. * - * $Id$ + * $Id: disks.c,v 1.82 1997/03/11 16:27:25 joerg Exp $ * * Copyright (c) 1995 * Jordan Hubbard. All rights reserved. @@ -85,8 +85,8 @@ print_chunks(Disk *d) "the Hardware Guide in the Documentation submenu or use the\n" "(G)eometry command to change it now.\n\n" "Remember: you need to enter whatever your BIOS thinks the\n" - "geometry were! For IDE, that's what you have told in the BIOS\n" - "setup, for SCSI, it's the translation mode your controller is\n" + "geometry is! For IDE, it's what you were told in the BIOS\n" + "setup. For SCSI, it's the translation mode your controller is\n" "using. Do NOT use a ``physical geometry''.", d->bios_cyl, d->bios_hd, d->bios_sect, d->name); Sanitize_Bios_Geom(d); diff --git a/usr.sbin/sade/globals.c b/usr.sbin/sade/globals.c index f96ad5a..72aecb1 100644 --- a/usr.sbin/sade/globals.c +++ b/usr.sbin/sade/globals.c @@ -4,7 +4,7 @@ * This is probably the last program in the `sysinstall' line - the next * generation being essentially a complete rewrite. * - * $Id$ + * $Id: globals.c,v 1.18 1997/02/22 14:11:43 peter Exp $ * * Copyright (c) 1995 * Jordan Hubbard. All rights reserved. @@ -51,6 +51,7 @@ Variable *VarHead; /* The head of the variable chain */ Device *mediaDevice; /* Where we're installing from */ int BootMgr; /* Which boot manager we're using */ int StatusLine; /* Where to stick our status messages */ +jmp_buf BailOut; /* Beam me up, scotty! The natives are pissed! */ /* * Yes, I know some of these are already automatically initialized as diff --git a/usr.sbin/sade/main.c b/usr.sbin/sade/main.c index 2f1f3a2..c267838 100644 --- a/usr.sbin/sade/main.c +++ b/usr.sbin/sade/main.c @@ -4,7 +4,7 @@ * This is probably the last attempt in the `sysinstall' line, the next * generation being slated for what's essentially a complete rewrite. * - * $Id: main.c,v 1.43 1997/02/22 14:11:55 peter Exp $ + * $Id: main.c,v 1.44 1997/03/19 10:09:17 jkh Exp $ * * Copyright (c) 1995 * Jordan Hubbard. All rights reserved. @@ -42,12 +42,13 @@ static void screech(int sig) { msgDebug("\007Signal %d caught! That's bad!\n", sig); + longjmp(BailOut, sig); } int main(int argc, char **argv) { - int choice, scroll, curr, max; + int choice, scroll, curr, max, status; /* Catch fatal signals and complain about them if running as init */ if (getpid() == 1) { @@ -119,7 +120,17 @@ main(int argc, char **argv) fclose(fp); } } - + + status = setjmp(BailOut); + if (status) { + msgConfirm("A signal %d was caught - I'm saving what I can and shutting\n" + "this thing down! Please report this unfortunate incident\n" + "to jkh@FreeBSD.org. If you can reproduce the problem, please\n" + "also turn Debug on in the Options menu for the extra information\n" + "it provides in debugging problems like this. Thanks!", status); + systemShutdown(status); + } + /* Begin user dialog at outer menu */ dialog_clear(); while (1) { diff --git a/usr.sbin/sade/menus.c b/usr.sbin/sade/menus.c index c5c573c..a3b0956 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.129 1997/03/25 03:07:39 jkh Exp $ + * $Id: menus.c,v 1.130 1997/03/27 01:44:11 jkh Exp $ * * Copyright (c) 1995 * Jordan Hubbard. All rights reserved. @@ -53,6 +53,7 @@ clearSrc(dialogMenuItem *self) return DITEM_SUCCESS | DITEM_REDRAW; } +#ifndef USE_XIG_ENVIRONMENT static int setX11All(dialogMenuItem *self) { @@ -121,6 +122,7 @@ clearX11Fonts(dialogMenuItem *self) XF86FontDists = 0; return DITEM_SUCCESS | DITEM_REDRAW; } +#endif /* !USE_XIG_ENVIRONMENT */ #define IS_DEVELOPER(dist, extra) ((((dist) & (_DIST_DEVELOPER | (extra))) == (_DIST_DEVELOPER | (extra))) || \ (((dist) & (_DIST_DEVELOPER | DIST_DES | (extra))) == (_DIST_DEVELOPER | DIST_DES | (extra)))) @@ -166,8 +168,12 @@ checkDistMinimum(dialogMenuItem *self) static int checkDistEverything(dialogMenuItem *self) { +#ifdef USE_XIG_ENVIRONMENT + return (Dists == DIST_ALL && SrcDists == DIST_SRC_ALL); +#else return (Dists == DIST_ALL && SrcDists == DIST_SRC_ALL && XF86Dists == DIST_XF86_ALL && XF86ServerDists == DIST_XF86_SERVER_ALL && XF86FontDists == DIST_XF86_FONTS_ALL); +#endif } static int @@ -182,11 +188,13 @@ srcFlagCheck(dialogMenuItem *item) return SrcDists; } +#ifndef USE_XIG_ENVIRONMENT static int x11FlagCheck(dialogMenuItem *item) { return XF86Dists; } +#endif static int checkTrue(dialogMenuItem *item) @@ -225,7 +233,9 @@ DMenu MenuIndex = { { "Dists, User", "Select average user distribution.", checkDistUser, distSetUser }, { "Dists, X User", "Select average X user distribution.", checkDistXUser, distSetXUser }, { "Distributions, Adding", "Installing additional distribution sets", NULL, distExtractAll }, +#ifndef USE_XIG_ENVIRONMENT { "Distributions, XFree86","XFree86 distribution menu.", NULL, distSetXF86 }, +#endif { "Documentation", "Installation instructions, README, etc.", NULL, dmenuSubmenu, NULL, &MenuDocumentation }, { "Doc, README", "The distribution README file.", NULL, dmenuDisplayFile, NULL, "readme" }, { "Doc, Hardware", "The distribution hardware guide.", NULL, dmenuDisplayFile, NULL, "hardware" }, @@ -276,9 +286,11 @@ DMenu MenuIndex = { { "Usage", "Quick start - How to use this menu system.", NULL, dmenuDisplayFile, NULL, "usage" }, { "User Management", "Add user and group information.", NULL, dmenuSubmenu, NULL, &MenuUsermgmt }, { "WEB Server", "Configure host as a WWW server.", dmenuVarCheck, configApache, NULL, "apache_httpd" }, +#ifndef USE_XIG_ENVIRONMENT { "XFree86, Fonts", "XFree86 Font selection menu.", NULL, dmenuSubmenu, NULL, &MenuXF86SelectFonts }, { "XFree86, Server", "XFree86 Server selection menu.", NULL, dmenuSubmenu, NULL, &MenuXF86SelectServer }, { "XFree86, PC98 Server", "XFree86 PC98 Server selection menu.", NULL, dmenuSubmenu, NULL, &MenuXF86SelectPC98Server }, +#endif { NULL } }, }; @@ -363,7 +375,7 @@ DMenu MenuMouse = { "There are many different types of mice currently on the market,\n" "but this configuration menu should at least narrow down the choices\n" "somewhat. Once you've selected one of the below, you can specify\n" - "/dev/mouse as your mouse device when running the XFree86 configuration\n" + "/dev/mouse as your mouse device when running the X configuration\n" "utility (see Configuration menu). Please note that for PS/2 mice,\n" "you need to enable the psm driver in the kernel configuration menu\n" "when installing for the first time.", @@ -384,6 +396,7 @@ DMenu MenuMouse = { { NULL } }, }; +#ifndef USE_XIG_ENVIRONMENT DMenu MenuXF86Config = { DMENU_NORMAL_TYPE | DMENU_SELECTION_RETURNS, "Please select the XFree86 configuration tool you want to use.", @@ -402,6 +415,7 @@ DMenu MenuXF86Config = { NULL, dmenuSetVariable, NULL, VAR_XF86_CONFIG "=xf86config" }, { NULL } }, }; +#endif DMenu MenuMediaCDROM = { DMENU_NORMAL_TYPE | DMENU_SELECTION_RETURNS, @@ -656,19 +670,19 @@ DMenu MenuDistributions = { "distributions", { { "1 Developer", "Full sources, binaries and doc but no games", checkDistDeveloper, distSetDeveloper }, - { "2 X-Developer", "Same as above, but includes XFree86", + { "2 X-Developer", "Same as above, but includes the X Window System", checkDistXDeveloper, distSetXDeveloper }, { "3 Kern-Developer", "Full binaries and doc, kernel sources only", checkDistKernDeveloper, distSetKernDeveloper }, { "4 User", "Average user - binaries and doc only", checkDistUser, distSetUser }, - { "5 X-User", "Same as above, but includes XFree86", + { "5 X-User", "Same as above, but includes the X Window System", checkDistXUser, distSetXUser }, { "6 Minimal", "The smallest configuration possible", checkDistMinimum, distSetMinimum }, { "7 Custom", "Specify your own distribution set", NULL, dmenuSubmenu, NULL, &MenuSubDistributions, '>', '>', '>' }, - { "8 All", "All sources, binaries and XFree86 binaries", + { "8 All", "All sources and binaries (incl X Window System)", checkDistEverything, distSetEverything }, { "9 Clear", "Reset selected distribution list to nothing", NULL, distReset, NULL, NULL, ' ', ' ', ' ' }, @@ -713,9 +727,11 @@ DMenu MenuSubDistributions = { srcFlagCheck, distSetSrc }, { "ports", "The FreeBSD Ports collection", dmenuFlagCheck, dmenuSetFlag, NULL, &Dists, '[', 'X', ']', DIST_PORTS }, +#ifndef USE_XIG_ENVIRONMENT { "XFree86", "The XFree86 3.2 distribution", x11FlagCheck, distSetXF86 }, - { "All", "All sources, binaries and XFree86 binaries", +#endif + { "All", "All sources, binaries and X Window System binaries", NULL, distSetEverything, NULL, NULL, ' ', ' ', ' ' }, { "Clear", "Reset all of the above", NULL, distReset, NULL, NULL, ' ', ' ', ' ' }, @@ -796,18 +812,18 @@ DMenu MenuSrcDistributions = { { NULL } }, }; +#ifndef USE_XIG_ENVIRONMENT DMenu MenuXF86Select = { DMENU_NORMAL_TYPE, "XFree86 3.2 Distribution", "Please select the components you need from the XFree86 3.2\n" - "distribution. We recommend that you select what you need from the basic\n" - "component set and at least one entry from the Server and Font set menus.", + "distribution sets.", "Press F1 to read the XFree86 release notes for FreeBSD", "XF86", { { "Basic", "Basic component menu (required)", NULL, dmenuSubmenu, NULL, &MenuXF86SelectCore }, { "Server", "X server menu", NULL, dmenuSubmenu, NULL, &MenuXF86SelectServer }, { "Fonts", "Font set menu", NULL, dmenuSubmenu, NULL, &MenuXF86SelectFonts }, - { "All", "Select the entire XFree86 distribution", NULL, setX11All }, + { "All", "Select all XFree86 distribution sets", NULL, setX11All }, { "Clear", "Reset XFree86 distribution list", NULL, clearX11All }, { "Exit", "Exit this menu (returning to previous)", checkTrue, dmenuExit, NULL, NULL, '<', '<', '<' }, { NULL } }, @@ -830,18 +846,22 @@ DMenu MenuXF86SelectCore = { dmenuFlagCheck, dmenuSetFlag, NULL, &XF86Dists, '[', 'X', ']', DIST_XF86_HTML }, { "lib", "Data files needed at runtime", dmenuFlagCheck, dmenuSetFlag, NULL, &XF86Dists, '[', 'X', ']', DIST_XF86_LIB }, +#ifndef USE_XIG_ENVIRONMENT { "lk98", "Server link kit for PC98 machines", dmenuFlagCheck, dmenuSetFlag, NULL, &XF86Dists, '[', 'X', ']', DIST_XF86_LKIT98 }, { "lkit", "Server link kit for all other machines", dmenuFlagCheck, dmenuSetFlag, NULL, &XF86Dists, '[', 'X', ']', DIST_XF86_LKIT }, +#endif { "man", "Manual pages", dmenuFlagCheck, dmenuSetFlag, NULL, &XF86Dists, '[', 'X', ']', DIST_XF86_MAN }, { "prog", "Programmer's header and library files", dmenuFlagCheck, dmenuSetFlag, NULL, &XF86Dists, '[', 'X', ']', DIST_XF86_PROG }, { "ps", "Postscript documentation", dmenuFlagCheck, dmenuSetFlag, NULL, &XF86Dists, '[', 'X', ']', DIST_XF86_PS }, +#ifndef USE_XIG_ENVIRONMENT { "set", "XFree86 Setup Utility", dmenuFlagCheck, dmenuSetFlag, NULL, &XF86Dists, '[', 'X', ']', DIST_XF86_SET }, +#endif { "sources", "XFree86 3.2 standard sources", dmenuFlagCheck, dmenuSetFlag, NULL, &XF86Dists, '[', 'X', ']', DIST_XF86_SRC }, { "csources", "XFree86 3.2 contrib sources", @@ -972,7 +992,7 @@ Mono servers are particularly well-suited to most LCD displays).", checkTrue, dmenuExit, NULL, NULL, '<', '<', '<' }, { NULL } } }; - +#endif /* !USE_XIG_ENVIRONMENT */ DMenu MenuDiskDevices = { DMENU_CHECKLIST_TYPE | DMENU_SELECTION_RETURNS, @@ -1077,7 +1097,11 @@ DMenu MenuConfigure = { NULL, dmenuSystemCommand, NULL, "passwd root" }, { "A HTML Docs", "Go to the HTML documentation menu (post-install)", NULL, docBrowser }, +#ifdef USE_XIG_ENVIRONMENT + { "X X + CDE", "Configure X Window system & CDE environment", +#else { "X XFree86", "Configure XFree86", +#endif NULL, configXFree86 }, { "D Distributions", "Install additional distribution sets", NULL, distExtractAll }, diff --git a/usr.sbin/sade/msg.c b/usr.sbin/sade/msg.c index 76707c6..fe49f2f 100644 --- a/usr.sbin/sade/msg.c +++ b/usr.sbin/sade/msg.c @@ -4,7 +4,7 @@ * This is probably the last program in the `sysinstall' line - the next * generation being essentially a complete rewrite. * - * $Id$ + * $Id: msg.c,v 1.44 1997/02/22 14:12:10 peter Exp $ * * Copyright (c) 1995 * Jordan Hubbard. All rights reserved. @@ -192,7 +192,6 @@ msgConfirm(char *fmt, ...) use_helpline(NULL); use_helpfile(NULL); if (OnVTY) { - msgDebug("Switching back to VTY1\n"); ioctl(0, VT_ACTIVATE, 1); msgInfo(NULL); } @@ -233,7 +232,6 @@ msgYesNo(char *fmt, ...) use_helpline(NULL); use_helpfile(NULL); if (OnVTY) { - msgDebug("Switching back to VTY1\n"); ioctl(0, VT_ACTIVATE, 1); /* Switch back */ msgInfo(NULL); } @@ -261,7 +259,6 @@ msgGetInput(char *buf, char *fmt, ...) else input_buffer[0] = '\0'; if (OnVTY) { - msgDebug("Switching back to VTY1\n"); ioctl(0, VT_ACTIVATE, 1); /* Switch back */ msgInfo(NULL); } diff --git a/usr.sbin/sade/sade.h b/usr.sbin/sade/sade.h index bd7e775..9aa9320 100644 --- a/usr.sbin/sade/sade.h +++ b/usr.sbin/sade/sade.h @@ -4,7 +4,7 @@ * This is probably the last attempt in the `sysinstall' line, the next * generation being slated to essentially a complete rewrite. * - * $Id: sysinstall.h,v 1.122 1997/03/19 10:09:26 jkh Exp $ + * $Id: sysinstall.h,v 1.123 1997/04/02 12:07:39 jkh Exp $ * * Copyright (c) 1995 * Jordan Hubbard. All rights reserved. @@ -39,6 +39,7 @@ #include <sys/types.h> #include <sys/wait.h> +#include <setjmp.h> #include <stdio.h> #include <stdlib.h> #include <string.h> @@ -55,11 +56,11 @@ /* Different packages we depend on - update this when package version change! */ #define PACKAGE_GATED "gated-3.5b3" -#define PACKAGE_APACHE "apache-1.2b7" +#define PACKAGE_APACHE "apache-1.2b8" #define PACKAGE_NETCON "commerce/netcon/bsd61" #define PACKAGE_PCNFSD "pcnfsd-93.02.16" #define PACKAGE_SAMBA "samba-1.9.15p8" -#define PACKAGE_LYNX "lynx-2.7" +#define PACKAGE_LYNX "lynx-2.7.1" /* device limits */ #define DEV_NAME_MAX 64 /* The maximum length of a device name */ @@ -314,6 +315,7 @@ typedef struct _devPriv { /*** Externs ***/ +extern jmp_buf BailOut; /* Used to get the heck out */ extern int DebugFD; /* Where diagnostic output goes */ extern Boolean Fake; /* Don't actually modify anything - testing */ extern Boolean SystemWasInstalled; /* Did we install it? */ diff --git a/usr.sbin/sysinstall/Makefile b/usr.sbin/sysinstall/Makefile index 0a2440f..0774972 100644 --- a/usr.sbin/sysinstall/Makefile +++ b/usr.sbin/sysinstall/Makefile @@ -17,6 +17,7 @@ SRCS= anonFTP.c apache.c attr.c cdrom.c command.c config.c devices.c \ CFLAGS+= -Wall -I${.CURDIR}/../../gnu/lib/libdialog -I${.OBJDIR} -I/sys CFLAGS+= -DUC_PRIVATE -DKERN_NO_SYMBOLS -DSAVE_USERCONFIG +#CFLAGS+= -DUSE_XIG_ENVIRONMENT .if defined(LOAD_CONFIG_FILE) CFLAGS+= -DLOAD_CONFIG_FILE=\"${LOAD_CONFIG_FILE}\" diff --git a/usr.sbin/sysinstall/config.c b/usr.sbin/sysinstall/config.c index f551a18..3cb6625 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.85 1997/03/09 22:25:42 jkh Exp $ + * $Id: config.c,v 1.86 1997/03/12 02:31:28 jkh Exp $ * * Copyright (c) 1995 * Jordan Hubbard. All rights reserved. @@ -480,10 +480,57 @@ configUsers(dialogMenuItem *self) int configXFree86(dialogMenuItem *self) { +#ifndef USE_XIG_ENVIRONMENT char *config, *execfile; dialog_clear_norefresh(); - dmenuOpenSimple(&MenuXF86Config, FALSE); + if (!dmenuOpenSimple(&MenuXF86Config, FALSE)) + return DITEM_FAILURE | DITEM_RESTORE; +#endif + systemExecute("/sbin/ldconfig /usr/lib /usr/X11R6/lib /usr/local/lib /usr/lib/compat"); +#ifdef USE_XIG_ENVIRONMENT + if (!file_readable("/usr/X11R6/lib/X11/AcceleratedX/bin/Xinstall") || + !file_readable("/usr/X11R6/lib/X11/AcceleratedX/bin/Xsetup")) { + dialog_clear_norefresh(); + msgConfirm("Hmmm! It looks like you elected not to install the AccelleratedX\n" + "server package (or the installation failed somehow). If this was\n" + "an omission rather than an error, please go to the Distributions\n" + "menu, select the Custom distribution options and then choose your X11\n" + "distribution components from the XFree86 menu. AccelX will be selected\n" + "as the default server automatically."); + return DITEM_FAILURE | DITEM_RESTORE; + } + else { + int i; + + if (directory_exists("/dist/CDE") && !msgYesNo("Would you like to install the CDE desktop package now?")) { + dialog_clear_norefresh(); + msgNotify("Running CDE installation - please wait (this may take awhile!)."); + dialog_clear(); + i = systemExecute("(cd /dist/CDE; sh Install)"); + dialog_clear(); + if (i) { + msgConfirm("/dist/CDE/dtinstall script returned an error status!\n\n" + "To try again, you should run this command manually after the system\n" + "is up (and if your CDROM is mounted in the standard location, the path\n" + "to it will actually be /cdrom/CDE/dtinstall when you run it later).\n"); + } + } + + dialog_clear_norefresh(); + msgNotify("Running AcceleratedX 3.1 installation procedure, please wait."); + if ((i = vsystem("/usr/X11R6/lib/X11/AcceleratedX/bin/Xinstall"))) { + msgConfirm("Installation procedure failed, error code %d! Please report\n" + "error to Walnut Creek CDROM tech support (either send email\n" + "to support@cdrom.com or call +1 510 603 1234). Thank you!", i); + return DITEM_FAILURE | DITEM_RESTORE; + } + dialog_clear(); + systemExecute("/usr/X11R6/lib/X11/AcceleratedX/bin/Xsetup"); + return DITEM_SUCCESS | DITEM_RESTORE; + } + +#else /* !USE_XIG_ENVIRONMENT */ config = variable_get(VAR_XF86_CONFIG); if (!config) @@ -494,7 +541,6 @@ configXFree86(dialogMenuItem *self) if (!file_readable("/dev/mouse") && !msgYesNo("Does this system have a mouse attached to it?")) dmenuOpenSimple(&MenuMouse, FALSE); dialog_clear(); - systemExecute("/sbin/ldconfig /usr/lib /usr/X11R6/lib /usr/local/lib /usr/lib/compat"); systemExecute(execfile); return DITEM_SUCCESS | DITEM_RESTORE; } @@ -502,8 +548,9 @@ configXFree86(dialogMenuItem *self) dialog_clear_norefresh(); msgConfirm("XFree86 does not appear to be installed! Please install\n" "The XFree86 distribution before attempting to configure it."); - return DITEM_FAILURE; + return DITEM_FAILURE | DITEM_RESTORE; } +#endif /* USE_XIG_ENVIRONMENT */ } void diff --git a/usr.sbin/sysinstall/disks.c b/usr.sbin/sysinstall/disks.c index 32c1ab6..a6e552c 100644 --- a/usr.sbin/sysinstall/disks.c +++ b/usr.sbin/sysinstall/disks.c @@ -4,7 +4,7 @@ * This is probably the last program in the `sysinstall' line - the next * generation being essentially a complete rewrite. * - * $Id$ + * $Id: disks.c,v 1.82 1997/03/11 16:27:25 joerg Exp $ * * Copyright (c) 1995 * Jordan Hubbard. All rights reserved. @@ -85,8 +85,8 @@ print_chunks(Disk *d) "the Hardware Guide in the Documentation submenu or use the\n" "(G)eometry command to change it now.\n\n" "Remember: you need to enter whatever your BIOS thinks the\n" - "geometry were! For IDE, that's what you have told in the BIOS\n" - "setup, for SCSI, it's the translation mode your controller is\n" + "geometry is! For IDE, it's what you were told in the BIOS\n" + "setup. For SCSI, it's the translation mode your controller is\n" "using. Do NOT use a ``physical geometry''.", d->bios_cyl, d->bios_hd, d->bios_sect, d->name); Sanitize_Bios_Geom(d); diff --git a/usr.sbin/sysinstall/dist.c b/usr.sbin/sysinstall/dist.c index ec6ac3a..4cafbbc 100644 --- a/usr.sbin/sysinstall/dist.c +++ b/usr.sbin/sysinstall/dist.c @@ -4,7 +4,7 @@ * This is probably the last program in the `sysinstall' line - the next * generation being essentially a complete rewrite. * - * $Id: dist.c,v 1.73.2.23 1997/03/25 02:45:37 jkh Exp $ + * $Id: dist.c,v 1.105 1997/04/02 12:07:27 jkh Exp $ * * Copyright (c) 1995 * Jordan Hubbard. All rights reserved. @@ -41,9 +41,11 @@ unsigned int Dists; unsigned int DESDists; unsigned int SrcDists; +#ifndef USE_XIG_ENVIRONMENT unsigned int XF86Dists; unsigned int XF86ServerDists; unsigned int XF86FontDists; +#endif typedef struct _dist { char *my_name; @@ -56,9 +58,11 @@ typedef struct _dist { extern Distribution DistTable[]; extern Distribution DESDistTable[]; extern Distribution SrcDistTable[]; +#ifndef USE_XIG_ENVIRONMENT extern Distribution XF86DistTable[]; extern Distribution XF86FontDistTable[]; extern Distribution XF86ServerDistTable[]; +#endif /* The top-level distribution categories */ static Distribution DistTable[] = { @@ -76,7 +80,11 @@ static Distribution DistTable[] = { { "compat20", "/", &Dists, DIST_COMPAT20, NULL }, { "compat21", "/", &Dists, DIST_COMPAT21, NULL }, { "ports", "/usr", &Dists, DIST_PORTS, NULL }, +#ifdef USE_XIG_ENVIRONMENT +{ "accelx", "/usr/X11R6/lib/X11", &Dists, DIST_XIG_SERVER, NULL }, +#else { "XF8632", "/usr", &Dists, DIST_XF86, XF86DistTable }, +#endif { NULL }, }; @@ -111,6 +119,7 @@ static Distribution SrcDistTable[] = { { NULL }, }; +#ifndef USE_XIG_ENVIRONMENT /* The XFree86 distribution */ static Distribution XF86DistTable[] = { { "XF8632", "/usr/X11R6", &XF86Dists, DIST_XF86_FONTS, XF86FontDistTable }, @@ -173,6 +182,7 @@ static Distribution XF86FontDistTable[] = { { "X32fsrv", "/usr/X11R6", &XF86FontDists, DIST_XF86_FONTS_SERVER, NULL }, { NULL }, }; +#endif /* !USE_XIG_ENVIRONMENT */ static int distMaybeSetDES(dialogMenuItem *self); static int distMaybeSetPorts(dialogMenuItem *self); @@ -183,9 +193,11 @@ distReset(dialogMenuItem *self) Dists = 0; DESDists = 0; SrcDists = 0; +#ifndef USE_XIG_ENVIRONMENT XF86Dists = 0; XF86ServerDists = 0; XF86FontDists = 0; +#endif return DITEM_SUCCESS | DITEM_REDRAW; } @@ -204,9 +216,13 @@ distSetXDeveloper(dialogMenuItem *self) distReset(NULL); Dists = _DIST_DEVELOPER; SrcDists = DIST_SRC_ALL; +#ifdef USE_XIG_ENVIRONMENT + Dists |= (DIST_XIG_SERVER | DIST_COMPAT21); +#else XF86Dists = DIST_XF86_BIN | DIST_COMPAT21 | DIST_XF86_SET | DIST_XF86_CFG | DIST_XF86_LIB | DIST_XF86_PROG | DIST_XF86_MAN | DIST_XF86_SERVER | DIST_XF86_FONTS; XF86ServerDists = DIST_XF86_SERVER_SVGA | DIST_XF86_SERVER_VGA16; XF86FontDists = DIST_XF86_FONTS_MISC; +#endif return distSetXF86(NULL) | distMaybeSetDES(self) | distMaybeSetPorts(self); } @@ -232,9 +248,13 @@ distSetXUser(dialogMenuItem *self) { distReset(NULL); Dists = _DIST_USER; - XF86Dists = DIST_XF86_BIN | DIST_COMPAT21 | DIST_XF86_SET | DIST_XF86_CFG | DIST_XF86_LIB | DIST_XF86_MAN | DIST_XF86_SERVER | DIST_XF86_FONTS; +#ifdef USE_XIG_ENVIRONMENT + Dists |= (DIST_XIG_SERVER | DIST_COMPAT21); +#else XF86ServerDists = DIST_XF86_SERVER_SVGA | DIST_XF86_SERVER_VGA16; + XF86Dists = DIST_XF86_BIN | DIST_COMPAT21 | DIST_XF86_SET | DIST_XF86_CFG | DIST_XF86_LIB | DIST_XF86_MAN | DIST_XF86_SERVER | DIST_XF86_FONTS; XF86FontDists = DIST_XF86_FONTS_MISC; +#endif return distSetXF86(NULL) | distMaybeSetDES(self) | distMaybeSetPorts(self); } @@ -251,9 +271,13 @@ distSetEverything(dialogMenuItem *self) { Dists = DIST_ALL; SrcDists = DIST_SRC_ALL; +#ifdef USE_XIG_ENVIRONMENT + Dists |= (DIST_XIG_SERVER | DIST_COMPAT21); +#else XF86Dists = DIST_XF86_ALL; XF86ServerDists = DIST_XF86_SERVER_ALL; XF86FontDists = DIST_XF86_FONTS_ALL; +#endif return distMaybeSetDES(self) | distMaybeSetPorts(self); } @@ -347,6 +371,9 @@ distSetXF86(dialogMenuItem *self) { int i = DITEM_SUCCESS; +#ifdef USE_XIG_ENVIRONMENT + Dists |= (DIST_XIG_SERVER | DIST_COMPAT21); +#else if (dmenuOpenSimple(&MenuXF86Select, FALSE)) { if (XF86ServerDists) XF86Dists |= DIST_XF86_SERVER; @@ -354,11 +381,13 @@ distSetXF86(dialogMenuItem *self) XF86Dists |= DIST_XF86_FONTS; if (XF86Dists) Dists |= (DIST_XF86 | DIST_COMPAT21); - msgDebug("SetXF86 Masks: Server: %0x, Fonts: %0x, XDists: %0x, Dists: %0x\n", - XF86ServerDists, XF86FontDists, XF86Dists, Dists); + if (isDebug()) + msgDebug("SetXF86 Masks: Server: %0x, Fonts: %0x, XDists: %0x, Dists: %0x\n", + XF86ServerDists, XF86FontDists, XF86Dists, Dists); } else i = DITEM_FAILURE; +#endif return i | DITEM_RECREATE; } diff --git a/usr.sbin/sysinstall/dist.h b/usr.sbin/sysinstall/dist.h index bf81f70..95e2d2b 100644 --- a/usr.sbin/sysinstall/dist.h +++ b/usr.sbin/sysinstall/dist.h @@ -17,6 +17,11 @@ #define DIST_DES 0x1000 #define DIST_CATPAGES 0x2000 #define DIST_PORTS 0x4000 +#ifdef USE_XIG_ENVIRONMENT +#define DIST_XIG_SERVER 0x8000 +#else +#define DIST_USR1 0x8000 +#endif #define DIST_ALL 0x7FFF /* Canned distribution sets */ @@ -52,6 +57,7 @@ #define DIST_SRC_SMAILCF 0x10000 #define DIST_SRC_ALL 0xFFFF /* no SMAILCF, it's part of USBIN */ +#ifndef USE_XIG_ENVIRONMENT /* Subtypes for XFree86 distribution */ #define DIST_XF86_BIN 0x0001 #define DIST_XF86_CFG 0x0002 @@ -105,6 +111,6 @@ #define DIST_XF86_FONTS_SERVER 0x0020 #define DIST_XF86_FONTS_ALL 0x003F #define DIST_XF86_ALL 0x1FFFF +#endif /* !USE_XIG_ENVIRONMENT */ -#endif -/* _DIST_H_INCLUDE */ +#endif /* _DIST_H_INCLUDE */ diff --git a/usr.sbin/sysinstall/globals.c b/usr.sbin/sysinstall/globals.c index f96ad5a..72aecb1 100644 --- a/usr.sbin/sysinstall/globals.c +++ b/usr.sbin/sysinstall/globals.c @@ -4,7 +4,7 @@ * This is probably the last program in the `sysinstall' line - the next * generation being essentially a complete rewrite. * - * $Id$ + * $Id: globals.c,v 1.18 1997/02/22 14:11:43 peter Exp $ * * Copyright (c) 1995 * Jordan Hubbard. All rights reserved. @@ -51,6 +51,7 @@ Variable *VarHead; /* The head of the variable chain */ Device *mediaDevice; /* Where we're installing from */ int BootMgr; /* Which boot manager we're using */ int StatusLine; /* Where to stick our status messages */ +jmp_buf BailOut; /* Beam me up, scotty! The natives are pissed! */ /* * Yes, I know some of these are already automatically initialized as diff --git a/usr.sbin/sysinstall/main.c b/usr.sbin/sysinstall/main.c index 2f1f3a2..c267838 100644 --- a/usr.sbin/sysinstall/main.c +++ b/usr.sbin/sysinstall/main.c @@ -4,7 +4,7 @@ * This is probably the last attempt in the `sysinstall' line, the next * generation being slated for what's essentially a complete rewrite. * - * $Id: main.c,v 1.43 1997/02/22 14:11:55 peter Exp $ + * $Id: main.c,v 1.44 1997/03/19 10:09:17 jkh Exp $ * * Copyright (c) 1995 * Jordan Hubbard. All rights reserved. @@ -42,12 +42,13 @@ static void screech(int sig) { msgDebug("\007Signal %d caught! That's bad!\n", sig); + longjmp(BailOut, sig); } int main(int argc, char **argv) { - int choice, scroll, curr, max; + int choice, scroll, curr, max, status; /* Catch fatal signals and complain about them if running as init */ if (getpid() == 1) { @@ -119,7 +120,17 @@ main(int argc, char **argv) fclose(fp); } } - + + status = setjmp(BailOut); + if (status) { + msgConfirm("A signal %d was caught - I'm saving what I can and shutting\n" + "this thing down! Please report this unfortunate incident\n" + "to jkh@FreeBSD.org. If you can reproduce the problem, please\n" + "also turn Debug on in the Options menu for the extra information\n" + "it provides in debugging problems like this. Thanks!", status); + systemShutdown(status); + } + /* Begin user dialog at outer menu */ dialog_clear(); while (1) { diff --git a/usr.sbin/sysinstall/menus.c b/usr.sbin/sysinstall/menus.c index c5c573c..a3b0956 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.129 1997/03/25 03:07:39 jkh Exp $ + * $Id: menus.c,v 1.130 1997/03/27 01:44:11 jkh Exp $ * * Copyright (c) 1995 * Jordan Hubbard. All rights reserved. @@ -53,6 +53,7 @@ clearSrc(dialogMenuItem *self) return DITEM_SUCCESS | DITEM_REDRAW; } +#ifndef USE_XIG_ENVIRONMENT static int setX11All(dialogMenuItem *self) { @@ -121,6 +122,7 @@ clearX11Fonts(dialogMenuItem *self) XF86FontDists = 0; return DITEM_SUCCESS | DITEM_REDRAW; } +#endif /* !USE_XIG_ENVIRONMENT */ #define IS_DEVELOPER(dist, extra) ((((dist) & (_DIST_DEVELOPER | (extra))) == (_DIST_DEVELOPER | (extra))) || \ (((dist) & (_DIST_DEVELOPER | DIST_DES | (extra))) == (_DIST_DEVELOPER | DIST_DES | (extra)))) @@ -166,8 +168,12 @@ checkDistMinimum(dialogMenuItem *self) static int checkDistEverything(dialogMenuItem *self) { +#ifdef USE_XIG_ENVIRONMENT + return (Dists == DIST_ALL && SrcDists == DIST_SRC_ALL); +#else return (Dists == DIST_ALL && SrcDists == DIST_SRC_ALL && XF86Dists == DIST_XF86_ALL && XF86ServerDists == DIST_XF86_SERVER_ALL && XF86FontDists == DIST_XF86_FONTS_ALL); +#endif } static int @@ -182,11 +188,13 @@ srcFlagCheck(dialogMenuItem *item) return SrcDists; } +#ifndef USE_XIG_ENVIRONMENT static int x11FlagCheck(dialogMenuItem *item) { return XF86Dists; } +#endif static int checkTrue(dialogMenuItem *item) @@ -225,7 +233,9 @@ DMenu MenuIndex = { { "Dists, User", "Select average user distribution.", checkDistUser, distSetUser }, { "Dists, X User", "Select average X user distribution.", checkDistXUser, distSetXUser }, { "Distributions, Adding", "Installing additional distribution sets", NULL, distExtractAll }, +#ifndef USE_XIG_ENVIRONMENT { "Distributions, XFree86","XFree86 distribution menu.", NULL, distSetXF86 }, +#endif { "Documentation", "Installation instructions, README, etc.", NULL, dmenuSubmenu, NULL, &MenuDocumentation }, { "Doc, README", "The distribution README file.", NULL, dmenuDisplayFile, NULL, "readme" }, { "Doc, Hardware", "The distribution hardware guide.", NULL, dmenuDisplayFile, NULL, "hardware" }, @@ -276,9 +286,11 @@ DMenu MenuIndex = { { "Usage", "Quick start - How to use this menu system.", NULL, dmenuDisplayFile, NULL, "usage" }, { "User Management", "Add user and group information.", NULL, dmenuSubmenu, NULL, &MenuUsermgmt }, { "WEB Server", "Configure host as a WWW server.", dmenuVarCheck, configApache, NULL, "apache_httpd" }, +#ifndef USE_XIG_ENVIRONMENT { "XFree86, Fonts", "XFree86 Font selection menu.", NULL, dmenuSubmenu, NULL, &MenuXF86SelectFonts }, { "XFree86, Server", "XFree86 Server selection menu.", NULL, dmenuSubmenu, NULL, &MenuXF86SelectServer }, { "XFree86, PC98 Server", "XFree86 PC98 Server selection menu.", NULL, dmenuSubmenu, NULL, &MenuXF86SelectPC98Server }, +#endif { NULL } }, }; @@ -363,7 +375,7 @@ DMenu MenuMouse = { "There are many different types of mice currently on the market,\n" "but this configuration menu should at least narrow down the choices\n" "somewhat. Once you've selected one of the below, you can specify\n" - "/dev/mouse as your mouse device when running the XFree86 configuration\n" + "/dev/mouse as your mouse device when running the X configuration\n" "utility (see Configuration menu). Please note that for PS/2 mice,\n" "you need to enable the psm driver in the kernel configuration menu\n" "when installing for the first time.", @@ -384,6 +396,7 @@ DMenu MenuMouse = { { NULL } }, }; +#ifndef USE_XIG_ENVIRONMENT DMenu MenuXF86Config = { DMENU_NORMAL_TYPE | DMENU_SELECTION_RETURNS, "Please select the XFree86 configuration tool you want to use.", @@ -402,6 +415,7 @@ DMenu MenuXF86Config = { NULL, dmenuSetVariable, NULL, VAR_XF86_CONFIG "=xf86config" }, { NULL } }, }; +#endif DMenu MenuMediaCDROM = { DMENU_NORMAL_TYPE | DMENU_SELECTION_RETURNS, @@ -656,19 +670,19 @@ DMenu MenuDistributions = { "distributions", { { "1 Developer", "Full sources, binaries and doc but no games", checkDistDeveloper, distSetDeveloper }, - { "2 X-Developer", "Same as above, but includes XFree86", + { "2 X-Developer", "Same as above, but includes the X Window System", checkDistXDeveloper, distSetXDeveloper }, { "3 Kern-Developer", "Full binaries and doc, kernel sources only", checkDistKernDeveloper, distSetKernDeveloper }, { "4 User", "Average user - binaries and doc only", checkDistUser, distSetUser }, - { "5 X-User", "Same as above, but includes XFree86", + { "5 X-User", "Same as above, but includes the X Window System", checkDistXUser, distSetXUser }, { "6 Minimal", "The smallest configuration possible", checkDistMinimum, distSetMinimum }, { "7 Custom", "Specify your own distribution set", NULL, dmenuSubmenu, NULL, &MenuSubDistributions, '>', '>', '>' }, - { "8 All", "All sources, binaries and XFree86 binaries", + { "8 All", "All sources and binaries (incl X Window System)", checkDistEverything, distSetEverything }, { "9 Clear", "Reset selected distribution list to nothing", NULL, distReset, NULL, NULL, ' ', ' ', ' ' }, @@ -713,9 +727,11 @@ DMenu MenuSubDistributions = { srcFlagCheck, distSetSrc }, { "ports", "The FreeBSD Ports collection", dmenuFlagCheck, dmenuSetFlag, NULL, &Dists, '[', 'X', ']', DIST_PORTS }, +#ifndef USE_XIG_ENVIRONMENT { "XFree86", "The XFree86 3.2 distribution", x11FlagCheck, distSetXF86 }, - { "All", "All sources, binaries and XFree86 binaries", +#endif + { "All", "All sources, binaries and X Window System binaries", NULL, distSetEverything, NULL, NULL, ' ', ' ', ' ' }, { "Clear", "Reset all of the above", NULL, distReset, NULL, NULL, ' ', ' ', ' ' }, @@ -796,18 +812,18 @@ DMenu MenuSrcDistributions = { { NULL } }, }; +#ifndef USE_XIG_ENVIRONMENT DMenu MenuXF86Select = { DMENU_NORMAL_TYPE, "XFree86 3.2 Distribution", "Please select the components you need from the XFree86 3.2\n" - "distribution. We recommend that you select what you need from the basic\n" - "component set and at least one entry from the Server and Font set menus.", + "distribution sets.", "Press F1 to read the XFree86 release notes for FreeBSD", "XF86", { { "Basic", "Basic component menu (required)", NULL, dmenuSubmenu, NULL, &MenuXF86SelectCore }, { "Server", "X server menu", NULL, dmenuSubmenu, NULL, &MenuXF86SelectServer }, { "Fonts", "Font set menu", NULL, dmenuSubmenu, NULL, &MenuXF86SelectFonts }, - { "All", "Select the entire XFree86 distribution", NULL, setX11All }, + { "All", "Select all XFree86 distribution sets", NULL, setX11All }, { "Clear", "Reset XFree86 distribution list", NULL, clearX11All }, { "Exit", "Exit this menu (returning to previous)", checkTrue, dmenuExit, NULL, NULL, '<', '<', '<' }, { NULL } }, @@ -830,18 +846,22 @@ DMenu MenuXF86SelectCore = { dmenuFlagCheck, dmenuSetFlag, NULL, &XF86Dists, '[', 'X', ']', DIST_XF86_HTML }, { "lib", "Data files needed at runtime", dmenuFlagCheck, dmenuSetFlag, NULL, &XF86Dists, '[', 'X', ']', DIST_XF86_LIB }, +#ifndef USE_XIG_ENVIRONMENT { "lk98", "Server link kit for PC98 machines", dmenuFlagCheck, dmenuSetFlag, NULL, &XF86Dists, '[', 'X', ']', DIST_XF86_LKIT98 }, { "lkit", "Server link kit for all other machines", dmenuFlagCheck, dmenuSetFlag, NULL, &XF86Dists, '[', 'X', ']', DIST_XF86_LKIT }, +#endif { "man", "Manual pages", dmenuFlagCheck, dmenuSetFlag, NULL, &XF86Dists, '[', 'X', ']', DIST_XF86_MAN }, { "prog", "Programmer's header and library files", dmenuFlagCheck, dmenuSetFlag, NULL, &XF86Dists, '[', 'X', ']', DIST_XF86_PROG }, { "ps", "Postscript documentation", dmenuFlagCheck, dmenuSetFlag, NULL, &XF86Dists, '[', 'X', ']', DIST_XF86_PS }, +#ifndef USE_XIG_ENVIRONMENT { "set", "XFree86 Setup Utility", dmenuFlagCheck, dmenuSetFlag, NULL, &XF86Dists, '[', 'X', ']', DIST_XF86_SET }, +#endif { "sources", "XFree86 3.2 standard sources", dmenuFlagCheck, dmenuSetFlag, NULL, &XF86Dists, '[', 'X', ']', DIST_XF86_SRC }, { "csources", "XFree86 3.2 contrib sources", @@ -972,7 +992,7 @@ Mono servers are particularly well-suited to most LCD displays).", checkTrue, dmenuExit, NULL, NULL, '<', '<', '<' }, { NULL } } }; - +#endif /* !USE_XIG_ENVIRONMENT */ DMenu MenuDiskDevices = { DMENU_CHECKLIST_TYPE | DMENU_SELECTION_RETURNS, @@ -1077,7 +1097,11 @@ DMenu MenuConfigure = { NULL, dmenuSystemCommand, NULL, "passwd root" }, { "A HTML Docs", "Go to the HTML documentation menu (post-install)", NULL, docBrowser }, +#ifdef USE_XIG_ENVIRONMENT + { "X X + CDE", "Configure X Window system & CDE environment", +#else { "X XFree86", "Configure XFree86", +#endif NULL, configXFree86 }, { "D Distributions", "Install additional distribution sets", NULL, distExtractAll }, diff --git a/usr.sbin/sysinstall/msg.c b/usr.sbin/sysinstall/msg.c index 76707c6..fe49f2f 100644 --- a/usr.sbin/sysinstall/msg.c +++ b/usr.sbin/sysinstall/msg.c @@ -4,7 +4,7 @@ * This is probably the last program in the `sysinstall' line - the next * generation being essentially a complete rewrite. * - * $Id$ + * $Id: msg.c,v 1.44 1997/02/22 14:12:10 peter Exp $ * * Copyright (c) 1995 * Jordan Hubbard. All rights reserved. @@ -192,7 +192,6 @@ msgConfirm(char *fmt, ...) use_helpline(NULL); use_helpfile(NULL); if (OnVTY) { - msgDebug("Switching back to VTY1\n"); ioctl(0, VT_ACTIVATE, 1); msgInfo(NULL); } @@ -233,7 +232,6 @@ msgYesNo(char *fmt, ...) use_helpline(NULL); use_helpfile(NULL); if (OnVTY) { - msgDebug("Switching back to VTY1\n"); ioctl(0, VT_ACTIVATE, 1); /* Switch back */ msgInfo(NULL); } @@ -261,7 +259,6 @@ msgGetInput(char *buf, char *fmt, ...) else input_buffer[0] = '\0'; if (OnVTY) { - msgDebug("Switching back to VTY1\n"); ioctl(0, VT_ACTIVATE, 1); /* Switch back */ msgInfo(NULL); } diff --git a/usr.sbin/sysinstall/sysinstall.h b/usr.sbin/sysinstall/sysinstall.h index bd7e775..9aa9320 100644 --- a/usr.sbin/sysinstall/sysinstall.h +++ b/usr.sbin/sysinstall/sysinstall.h @@ -4,7 +4,7 @@ * This is probably the last attempt in the `sysinstall' line, the next * generation being slated to essentially a complete rewrite. * - * $Id: sysinstall.h,v 1.122 1997/03/19 10:09:26 jkh Exp $ + * $Id: sysinstall.h,v 1.123 1997/04/02 12:07:39 jkh Exp $ * * Copyright (c) 1995 * Jordan Hubbard. All rights reserved. @@ -39,6 +39,7 @@ #include <sys/types.h> #include <sys/wait.h> +#include <setjmp.h> #include <stdio.h> #include <stdlib.h> #include <string.h> @@ -55,11 +56,11 @@ /* Different packages we depend on - update this when package version change! */ #define PACKAGE_GATED "gated-3.5b3" -#define PACKAGE_APACHE "apache-1.2b7" +#define PACKAGE_APACHE "apache-1.2b8" #define PACKAGE_NETCON "commerce/netcon/bsd61" #define PACKAGE_PCNFSD "pcnfsd-93.02.16" #define PACKAGE_SAMBA "samba-1.9.15p8" -#define PACKAGE_LYNX "lynx-2.7" +#define PACKAGE_LYNX "lynx-2.7.1" /* device limits */ #define DEV_NAME_MAX 64 /* The maximum length of a device name */ @@ -314,6 +315,7 @@ typedef struct _devPriv { /*** Externs ***/ +extern jmp_buf BailOut; /* Used to get the heck out */ extern int DebugFD; /* Where diagnostic output goes */ extern Boolean Fake; /* Don't actually modify anything - testing */ extern Boolean SystemWasInstalled; /* Did we install it? */ |
