summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--release/sysinstall/cdrom.c8
-rw-r--r--release/sysinstall/ftp.c15
-rw-r--r--release/sysinstall/menus.c208
-rw-r--r--release/sysinstall/network.c8
-rw-r--r--release/sysinstall/nfs.c4
-rw-r--r--usr.sbin/sade/menus.c208
-rw-r--r--usr.sbin/sysinstall/cdrom.c8
-rw-r--r--usr.sbin/sysinstall/ftp.c15
-rw-r--r--usr.sbin/sysinstall/menus.c208
-rw-r--r--usr.sbin/sysinstall/network.c8
-rw-r--r--usr.sbin/sysinstall/nfs.c4
11 files changed, 356 insertions, 338 deletions
diff --git a/release/sysinstall/cdrom.c b/release/sysinstall/cdrom.c
index 6ab57c2..9756102 100644
--- a/release/sysinstall/cdrom.c
+++ b/release/sysinstall/cdrom.c
@@ -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: cdrom.c,v 1.29 1996/12/12 08:33:35 jkh Exp $
+ * $Id: cdrom.c,v 1.30 1996/12/12 16:55:37 jkh Exp $
*
* Copyright (c) 1995
* Jordan Hubbard. All rights reserved.
@@ -107,7 +107,8 @@ mediaInitCDROM(Device *dev)
cdromMounted = CD_ALREADY_MOUNTED;
if (!dontRead && (DITEM_STATUS(attr_parse_file(cd_attr, "/cdrom/cdrom.inf")) == DITEM_FAILURE ||
!(cp = attr_match(cd_attr, "CD_VERSION")) || strcmp(cp, variable_get(VAR_RELNAME)))) {
- unmount("/cdrom", MNT_FORCE);
+ if (cdromMounted != CD_ALREADY_MOUNTED)
+ unmount("/cdrom", MNT_FORCE);
if (!cp)
msgConfirm("Unable to find a /cdrom/cdrom.inf file.\n"
"Either this is not a FreeBSD CDROM, there is a problem with\n"
@@ -120,7 +121,8 @@ mediaInitCDROM(Device *dev)
"(%s).\n\n"
"If this is intentional, then please visit the Options editor\n"
"to set the boot floppy version string to match that of the CD\n"
- "before selecting it as an installation media to avoid this warning", cp, variable_get(VAR_RELNAME));
+ "before selecting it as an installation media.", cp, variable_get(VAR_RELNAME));
+ return FALSE;
}
msgDebug("Mounted FreeBSD CDROM on device %s as /cdrom\n", dev->devname);
return TRUE;
diff --git a/release/sysinstall/ftp.c b/release/sysinstall/ftp.c
index 2810e98..0ba3fe0 100644
--- a/release/sysinstall/ftp.c
+++ b/release/sysinstall/ftp.c
@@ -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: ftp.c,v 1.19 1996/12/11 09:34:59 jkh Exp $
+ * $Id: ftp.c,v 1.20 1996/12/11 19:35:26 jkh Exp $
*
* Copyright (c) 1995
* Jordan Hubbard. All rights reserved.
@@ -55,6 +55,7 @@ mediaInitFTP(Device *dev)
int i, code;
char *cp, *rel, *hostname, *dir;
char *user, *login_name, password[80];
+ Device *netdev = (Device *)dev->private;
if (ftpInitted)
return TRUE;
@@ -67,6 +68,10 @@ mediaInitFTP(Device *dev)
OpenConn = NULL;
}
+ /* If we can't initialize the network, bag it! */
+ if (!netdev->init(netdev))
+ return FALSE;
+
try:
cp = variable_get(VAR_FTP_PATH);
if (!cp) {
@@ -80,10 +85,8 @@ try:
msgFatal("Missing FTP host or directory specification - something's wrong!");
user = variable_get(VAR_FTP_USER);
- if (!user || !*user)
- login_name = "anonymous";
- else
- login_name = user;
+ login_name = (!user || !*user) ? "anonymous" : user;
+
if (variable_get(VAR_FTP_PASS))
SAFE_STRCPY(password, variable_get(VAR_FTP_PASS));
else
@@ -216,6 +219,6 @@ mediaShutdownFTP(Device *dev)
fclose(OpenConn);
OpenConn = NULL;
}
- /* (*netdev->shutdown)(netdev); */
+ /* netdev->shutdown(netdev); */
ftpInitted = FALSE;
}
diff --git a/release/sysinstall/menus.c b/release/sysinstall/menus.c
index f855faf..708b5c1 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.102 1996/12/29 05:28:41 jkh Exp $
+ * $Id: menus.c,v 1.103 1996/12/29 05:51:37 jkh Exp $
*
* Copyright (c) 1995
* Jordan Hubbard. All rights reserved.
@@ -609,23 +609,23 @@ DMenu MenuDistributions = {
"item or press [ENTER].",
"Press F1 for more information on these options.",
"distributions",
- { { "1 Developer", "Full sources, binaries and doc but no games [180M]",
+ { { "1 Developer", "Full sources, binaries and doc but no games",
checkDistDeveloper, distSetDeveloper },
- { "2 X-Developer", "Same as above, but includes XFree86 [201M]",
+ { "2 X-Developer", "Same as above, but includes XFree86",
checkDistXDeveloper, distSetXDeveloper },
- { "3 Kern-Developer", "Full binaries and doc, kernel sources only [70M]",
+ { "3 Kern-Developer", "Full binaries and doc, kernel sources only",
checkDistKernDeveloper, distSetKernDeveloper },
- { "4 User", "Average user - binaries and doc only [52M]",
+ { "4 User", "Average user - binaries and doc only",
checkDistUser, distSetUser },
- { "5 X-User", "Same as above, but includes XFree86 [52M]",
+ { "5 X-User", "Same as above, but includes XFree86",
checkDistXUser, distSetXUser },
- { "6 Minimal", "The smallest configuration possible [44M]",
+ { "6 Minimal", "The smallest configuration possible",
checkDistMinimum, distSetMinimum },
- { "7 All", "All sources, binaries and XFree86 binaries [700M]",
+ { "7 All", "All sources, binaries and XFree86 binaries",
checkDistEverything, distSetEverything },
- { "8 Custom", "Specify your own distribution set [?]",
+ { "8 Custom", "Specify your own distribution set",
NULL, dmenuSubmenu, NULL, &MenuSubDistributions, '>', '>', '>' },
- { "9 Clear", "Reset selected distribution list to nothing [0M]",
+ { "9 Clear", "Reset selected distribution list to nothing",
NULL, distReset, NULL, NULL, ' ', ' ', ' ' },
{ "0 Exit", "Exit this menu (returning to previous)",
checkTrue, dmenuExit, NULL, NULL, '<', '<', '<' },
@@ -640,37 +640,37 @@ DMenu MenuSubDistributions = {
"DES distribution out of the U.S.! It is for U.S. customers only.",
NULL,
NULL,
- { { "bin", "Binary base distribution (required) [36M]",
+ { { "bin", "Binary base distribution (required)",
dmenuFlagCheck, dmenuSetFlag, NULL, &Dists, '[', 'X', ']', DIST_BIN },
- { "compat1x", "FreeBSD 1.x binary compatibility [2M]",
+ { "compat1x", "FreeBSD 1.x binary compatibility",
dmenuFlagCheck, dmenuSetFlag, NULL, &Dists, '[', 'X', ']', DIST_COMPAT1X },
- { "compat20", "FreeBSD 2.0 binary compatibility [2M]",
+ { "compat20", "FreeBSD 2.0 binary compatibility",
dmenuFlagCheck, dmenuSetFlag, NULL, &Dists, '[', 'X', ']', DIST_COMPAT20 },
- { "compat21", "FreeBSD 2.1 binary compatibility [2M]",
+ { "compat21", "FreeBSD 2.1 binary compatibility",
dmenuFlagCheck, dmenuSetFlag, NULL, &Dists, '[', 'X', ']', DIST_COMPAT21 },
- { "DES", "DES encryption code - NOT FOR EXPORT! [.3M]",
+ { "DES", "DES encryption code - NOT FOR EXPORT!",
DESFlagCheck, distSetDES },
- { "dict", "Spelling checker dictionary files [4.2M]",
+ { "dict", "Spelling checker dictionary files",
dmenuFlagCheck, dmenuSetFlag, NULL, &Dists, '[', 'X', ']', DIST_DICT },
- { "doc", "FreeBSD Handbook and other online docs [10M]",
+ { "doc", "FreeBSD Handbook and other online docs",
dmenuFlagCheck, dmenuSetFlag, NULL, &Dists, '[', 'X', ']', DIST_DOC },
- { "games", "Games (non-commercial) [6.4M]",
+ { "games", "Games (non-commercial)",
dmenuFlagCheck, dmenuSetFlag, NULL, &Dists, '[', 'X', ']', DIST_GAMES },
- { "info", "GNU info files [4.1M]",
+ { "info", "GNU info files",
dmenuFlagCheck, dmenuSetFlag, NULL, &Dists, '[', 'X', ']', DIST_INFO },
- { "man", "System manual pages - recommended [3.3M]",
+ { "man", "System manual pages - recommended",
dmenuFlagCheck, dmenuSetFlag, NULL, &Dists, '[', 'X', ']', DIST_MANPAGES },
- { "catman", "Preformatted system manual pages [3M]",
+ { "catman", "Preformatted system manual pages",
dmenuFlagCheck, dmenuSetFlag, NULL, &Dists, '[', 'X', ']', DIST_CATPAGES },
- { "proflibs", "Profiled versions of the libraries [3.3M]",
+ { "proflibs", "Profiled versions of the libraries",
dmenuFlagCheck, dmenuSetFlag, NULL, &Dists, '[', 'X', ']', DIST_PROFLIBS },
- { "src", "Sources for everything but DES [120M]",
+ { "src", "Sources for everything but DES",
srcFlagCheck, distSetSrc },
{ "XFree86", "The XFree86 3.2 distribution",
x11FlagCheck, distSetXF86 },
- { "All", "All sources, binaries and XFree86 binaries [700M]",
+ { "All", "All sources, binaries and XFree86 binaries",
NULL, distSetEverything, NULL, NULL, ' ', ' ', ' ' },
- { "Clear", "Reset all of the above [0M]",
+ { "Clear", "Reset all of the above",
NULL, distReset, NULL, NULL, ' ', ' ', ' ' },
{ "Exit", "Exit this menu (returning to previous)",
checkTrue, dmenuExit, NULL, NULL, '<', '<', '<' },
@@ -686,13 +686,13 @@ DMenu MenuDESDistributions = {
"distributions of this software, please consult the release notes.",
NULL,
NULL,
- { { "des", "Basic DES encryption services [1M]",
+ { { "des", "Basic DES encryption services",
dmenuFlagCheck, dmenuSetFlag, NULL, &DESDists, '[', 'X', ']', DIST_DES_DES, },
- { "krb", "Kerberos encryption services [2M]",
+ { "krb", "Kerberos encryption services",
dmenuFlagCheck, dmenuSetFlag, NULL, &DESDists, '[', 'X', ']', DIST_DES_KERBEROS },
- { "sebones", "Sources for eBones (Kerberos) [1M]",
+ { "sebones", "Sources for eBones (Kerberos)",
dmenuFlagCheck, dmenuSetFlag, NULL, &DESDists, '[', 'X', ']', DIST_DES_SEBONES },
- { "ssecure", "Sources for DES [1M]",
+ { "ssecure", "Sources for DES",
dmenuFlagCheck, dmenuSetFlag, NULL, &DESDists, '[', 'X', ']', DIST_DES_SSECURE },
{ "Exit", "Exit this menu (returning to previous)",
checkTrue, dmenuExit, NULL, NULL, '<', '<', '<' },
@@ -706,43 +706,43 @@ DMenu MenuSrcDistributions = {
"you wish to install.",
NULL,
NULL,
- { { "base", "top-level files in /usr/src [300K]",
+ { { "base", "top-level files in /usr/src",
dmenuFlagCheck, dmenuSetFlag, NULL, &SrcDists, '[', 'X', ']', DIST_SRC_BASE },
- { "contrib", "/usr/src/contrib (contributed software) [33M]",
+ { "contrib", "/usr/src/contrib (contributed software)",
dmenuFlagCheck, dmenuSetFlag, NULL, &SrcDists, '[', 'X', ']', DIST_SRC_CONTRIB },
- { "gnu", "/usr/src/gnu (software from the GNU Project) [42M]",
+ { "gnu", "/usr/src/gnu (software from the GNU Project)",
dmenuFlagCheck, dmenuSetFlag, NULL, &SrcDists, '[', 'X', ']', DIST_SRC_GNU },
- { "etc", "/usr/src/etc (miscellaneous system files) [460K]",
+ { "etc", "/usr/src/etc (miscellaneous system files)",
dmenuFlagCheck, dmenuSetFlag, NULL, &SrcDists, '[', 'X', ']', DIST_SRC_ETC },
- { "games", "/usr/src/games (the obvious!) [7.8M]",
+ { "games", "/usr/src/games (the obvious!)",
dmenuFlagCheck, dmenuSetFlag, NULL, &SrcDists, '[', 'X', ']', DIST_SRC_GAMES },
- { "include", "/usr/src/include (header files) [467K]",
+ { "include", "/usr/src/include (header files)",
dmenuFlagCheck, dmenuSetFlag, NULL, &SrcDists, '[', 'X', ']', DIST_SRC_INCLUDE },
- { "lib", "/usr/src/lib (system libraries) [9.2M]",
+ { "lib", "/usr/src/lib (system libraries)",
dmenuFlagCheck, dmenuSetFlag, NULL, &SrcDists, '[', 'X', ']', DIST_SRC_LIB },
- { "libexec", "/usr/src/libexec (system programs) [1.2M]",
+ { "libexec", "/usr/src/libexec (system programs)",
dmenuFlagCheck, dmenuSetFlag, NULL, &SrcDists, '[', 'X', ']', DIST_SRC_LIBEXEC },
- { "lkm", "/usr/src/lkm (Loadable Kernel Modules) [193K]",
+ { "lkm", "/usr/src/lkm (Loadable Kernel Modules)",
dmenuFlagCheck, dmenuSetFlag, NULL, &SrcDists, '[', 'X', ']', DIST_SRC_LKM },
- { "release", "/usr/src/release (release-generation tools) [533K]",
+ { "release", "/usr/src/release (release-generation tools)",
dmenuFlagCheck, dmenuSetFlag, NULL, &SrcDists, '[', 'X', ']', DIST_SRC_RELEASE },
- { "bin", "/usr/src/bin (system binaries) [2.5M]",
+ { "bin", "/usr/src/bin (system binaries)",
dmenuFlagCheck, dmenuSetFlag, NULL, &SrcDists, '[', 'X', ']', DIST_SRC_BIN },
- { "sbin", "/usr/src/sbin (system binaries) [1.3M]",
+ { "sbin", "/usr/src/sbin (system binaries)",
dmenuFlagCheck, dmenuSetFlag, NULL, &SrcDists, '[', 'X', ']', DIST_SRC_SBIN },
- { "share", "/usr/src/share (documents and shared files) [10M]",
+ { "share", "/usr/src/share (documents and shared files)",
dmenuFlagCheck, dmenuSetFlag, NULL, &SrcDists, '[', 'X', ']', DIST_SRC_SHARE },
- { "sys", "/usr/src/sys (FreeBSD kernel) [13M]",
+ { "sys", "/usr/src/sys (FreeBSD kernel)",
dmenuFlagCheck, dmenuSetFlag, NULL, &SrcDists, '[', 'X', ']', DIST_SRC_SYS },
- { "ubin", "/usr/src/usr.bin (user binaries) [13M]",
+ { "ubin", "/usr/src/usr.bin (user binaries)",
dmenuFlagCheck, dmenuSetFlag, NULL, &SrcDists, '[', 'X', ']', DIST_SRC_UBIN },
- { "usbin", "/usr/src/usr.sbin (aux system binaries) [14M]",
+ { "usbin", "/usr/src/usr.sbin (aux system binaries)",
dmenuFlagCheck, dmenuSetFlag, NULL, &SrcDists, '[', 'X', ']', DIST_SRC_USBIN },
- { "smailcf", "/usr/src/usr.sbin (sendmail config macros) [341K]",
+ { "smailcf", "/usr/src/usr.sbin (sendmail config macros)",
dmenuFlagCheck, dmenuSetFlag, NULL, &SrcDists, '[', 'X', ']', DIST_SRC_SMAILCF },
- { "All", "Select all of the above [120M]",
+ { "All", "Select all of the above",
NULL, setSrc, NULL, NULL, ' ', ' ', ' ' },
- { "Clear", "Reset all of the above [0M]",
+ { "Clear", "Reset all of the above",
NULL, clearSrc, NULL, NULL, ' ', ' ', ' ' },
{ "Exit", "Exit this menu (returning to previous)",
checkTrue, dmenuExit, NULL, NULL, '<', '<', '<' },
@@ -773,35 +773,35 @@ DMenu MenuXF86SelectCore = {
"Bin, lib, xicf, and xdcf are recommended for a minimum installaion.",
"Press F1 to read the XFree86 release notes for FreeBSD",
"XF86",
- { { "bin", "Client applications and shared libs [4.1M]",
+ { { "bin", "Client applications and shared libs",
dmenuFlagCheck, dmenuSetFlag, NULL, &XF86Dists, '[', 'X', ']', DIST_XF86_BIN },
- { "cfg", "Configuration files [10K]",
+ { "cfg", "Configuration files",
dmenuFlagCheck, dmenuSetFlag, NULL, &XF86Dists, '[', 'X', ']', DIST_XF86_CFG },
- { "doc", "READMEs and release notes [600K]",
+ { "doc", "READMEs and release notes",
dmenuFlagCheck, dmenuSetFlag, NULL, &XF86Dists, '[', 'X', ']', DIST_XF86_DOC },
- { "html", "HTML documentation files [400K]",
+ { "html", "HTML documentation files",
dmenuFlagCheck, dmenuSetFlag, NULL, &XF86Dists, '[', 'X', ']', DIST_XF86_HTML },
- { "lib", "Data files needed at runtime [750K]",
+ { "lib", "Data files needed at runtime",
dmenuFlagCheck, dmenuSetFlag, NULL, &XF86Dists, '[', 'X', ']', DIST_XF86_LIB },
- { "lk98", "Server link kit for PC98 machines [8.8M]",
+ { "lk98", "Server link kit for PC98 machines",
dmenuFlagCheck, dmenuSetFlag, NULL, &XF86Dists, '[', 'X', ']', DIST_XF86_LKIT98 },
- { "lkit", "Server link kit for all other machines [8.8M]",
+ { "lkit", "Server link kit for all other machines",
dmenuFlagCheck, dmenuSetFlag, NULL, &XF86Dists, '[', 'X', ']', DIST_XF86_LKIT },
- { "man", "Manual pages [3M]",
+ { "man", "Manual pages",
dmenuFlagCheck, dmenuSetFlag, NULL, &XF86Dists, '[', 'X', ']', DIST_XF86_MAN },
- { "prog", "Programmer's header and library files [4.1M]",
+ { "prog", "Programmer's header and library files",
dmenuFlagCheck, dmenuSetFlag, NULL, &XF86Dists, '[', 'X', ']', DIST_XF86_PROG },
- { "ps", "Postscript documentation [5M]",
+ { "ps", "Postscript documentation",
dmenuFlagCheck, dmenuSetFlag, NULL, &XF86Dists, '[', 'X', ']', DIST_XF86_PS },
- { "set", "XFree86 Setup Utility [1.0M]",
+ { "set", "XFree86 Setup Utility",
dmenuFlagCheck, dmenuSetFlag, NULL, &XF86Dists, '[', 'X', ']', DIST_XF86_SET },
- { "sources", "XFree86 3.2 standard sources [100M]",
+ { "sources", "XFree86 3.2 standard sources",
dmenuFlagCheck, dmenuSetFlag, NULL, &XF86Dists, '[', 'X', ']', DIST_XF86_SRC },
- { "csources", "XFree86 3.2 contrib sources [100M]",
+ { "csources", "XFree86 3.2 contrib sources",
dmenuFlagCheck, dmenuSetFlag, NULL, &XF86Dists, '[', 'X', ']', DIST_XF86_CSRC },
- { "All", "Select all of the above [20M]",
+ { "All", "Select all of the above",
NULL, setX11Misc, NULL, NULL, ' ', ' ', ' ' },
- { "Clear", "Reset all of the above [0M]",
+ { "Clear", "Reset all of the above",
NULL, clearX11Misc, NULL, NULL, ' ', ' ', ' ' },
{ "Exit", "Exit this menu (returning to previous)",
checkTrue, dmenuExit, NULL, NULL, '<', '<', '<' },
@@ -817,21 +817,21 @@ install. At the minimum, you should install the standard\n\
(these are selected by default).",
"Press F1 to read the XFree86 release notes for FreeBSD",
"XF86",
- { { "fnts", "Standard 75 DPI and miscellaneous fonts [3.6M]",
+ { { "fnts", "Standard 75 DPI and miscellaneous fonts",
dmenuFlagCheck, dmenuSetFlag, NULL, &XF86FontDists, '[', 'X', ']', DIST_XF86_FONTS_MISC },
- { "f100", "100 DPI fonts [1.8M]",
+ { "f100", "100 DPI fonts",
dmenuFlagCheck, dmenuSetFlag, NULL, &XF86FontDists, '[', 'X', ']', DIST_XF86_FONTS_100 },
- { "fcyr", "Cyrillic Fonts [1.8M]",
+ { "fcyr", "Cyrillic Fonts",
dmenuFlagCheck, dmenuSetFlag, NULL, &XF86FontDists, '[', 'X', ']', DIST_XF86_FONTS_CYR },
- { "fscl", "Speedo and Type scalable fonts [1.6M]",
+ { "fscl", "Speedo and Type scalable fonts",
dmenuFlagCheck, dmenuSetFlag, NULL, &XF86FontDists, '[', 'X', ']', DIST_XF86_FONTS_SCALE },
- { "non", "Japanese, Chinese and other non-english fonts [3.3M]",
+ { "non", "Japanese, Chinese and other non-english fonts",
dmenuFlagCheck, dmenuSetFlag, NULL, &XF86FontDists, '[', 'X', ']', DIST_XF86_FONTS_NON },
- { "server", "Font server [0.3M]",
+ { "server", "Font server",
dmenuFlagCheck, dmenuSetFlag, NULL, &XF86FontDists, '[', 'X', ']', DIST_XF86_FONTS_SERVER },
- { "All", "All fonts [10M]",
+ { "All", "All fonts",
NULL, setX11Fonts, NULL, NULL, ' ', ' ', ' ' },
- { "Clear", "Reset font selections [0M]",
+ { "Clear", "Reset font selections",
NULL, clearX11Fonts, NULL, NULL, ' ', ' ', ' ' },
{ "Exit", "Exit this menu (returning to previous)",
checkTrue, dmenuExit, NULL, NULL, '<', '<', '<' },
@@ -847,41 +847,41 @@ DMenu MenuXF86SelectServer = {
"machines, the 9EGC or 9840 servers.",
"Press F1 to read the XFree86 release notes for FreeBSD",
"XF86",
- { { "SVGA", "Standard VGA or Super VGA card [2.8M]",
+ { { "SVGA", "Standard VGA or Super VGA card",
dmenuFlagCheck, dmenuSetFlag, NULL, &XF86ServerDists, '[', 'X', ']', DIST_XF86_SERVER_SVGA },
- { "VGA16", "Standard 16 color VGA card [1.3M]",
+ { "VGA16", "Standard 16 color VGA card",
dmenuFlagCheck, dmenuSetFlag, NULL, &XF86ServerDists, '[', 'X', ']', DIST_XF86_SERVER_VGA16 },
- { "Mono", "Standard Monochrome card [1.3M]",
+ { "Mono", "Standard Monochrome card",
dmenuFlagCheck, dmenuSetFlag, NULL, &XF86ServerDists, '[', 'X', ']', DIST_XF86_SERVER_MONO },
- { "PC98", "Select an X server for a NEC PC98 [Submenu]",
- NULL, dmenuSubmenu, NULL, &MenuXF86SelectPC98Server, '>', ' ', '>', 0 },
- { "8514", "8-bit (256 color) IBM 8514 or compatible card [2.2M]",
+ { "8514", "8-bit (256 color) IBM 8514 or compatible card",
dmenuFlagCheck, dmenuSetFlag, NULL, &XF86ServerDists, '[', 'X', ']', DIST_XF86_SERVER_8514 },
- { "AGX", "8-bit AGX card [2.4M]",
+ { "AGX", "8-bit AGX card",
dmenuFlagCheck, dmenuSetFlag, NULL, &XF86ServerDists, '[', 'X', ']', DIST_XF86_SERVER_AGX },
- { "I128", "8, 16 and 24-bit #9 Imagine I128 card [2.4M]",
+ { "I128", "8, 16 and 24-bit #9 Imagine I128 card",
dmenuFlagCheck, dmenuSetFlag, NULL, &XF86ServerDists, '[', 'X', ']', DIST_XF86_SERVER_I128 },
- { "Ma8", "8-bit ATI Mach8 card [2.3M]",
+ { "Ma8", "8-bit ATI Mach8 card",
dmenuFlagCheck, dmenuSetFlag, NULL, &XF86ServerDists, '[', 'X', ']', DIST_XF86_SERVER_MACH8 },
- { "Ma32", "8 and 16-bit (65K color) ATI Mach32 card [2.4M]",
+ { "Ma32", "8 and 16-bit (65K color) ATI Mach32 card",
dmenuFlagCheck, dmenuSetFlag, NULL, &XF86ServerDists, '[', 'X', ']', DIST_XF86_SERVER_MACH32 },
- { "Ma64", "8 and 16-bit (65K color) ATI Mach64 card [2.5M]",
+ { "Ma64", "8 and 16-bit (65K color) ATI Mach64 card",
dmenuFlagCheck, dmenuSetFlag, NULL, &XF86ServerDists, '[', 'X', ']', DIST_XF86_SERVER_MACH64 },
- { "P9K", "8, 16, and 24-bit color Weitek P9000 based boards [2.5M]",
+ { "P9K", "8, 16, and 24-bit color Weitek P9000 based boards",
dmenuFlagCheck, dmenuSetFlag, NULL, &XF86ServerDists, '[', 'X', ']', DIST_XF86_SERVER_P9000 },
- { "S3", "8, 16 and 24-bit color S3 based boards [2.7M]",
+ { "S3", "8, 16 and 24-bit color S3 based boards",
dmenuFlagCheck, dmenuSetFlag, NULL, &XF86ServerDists, '[', 'X', ']', DIST_XF86_SERVER_S3 },
- { "S3V", "8, 16 and 24-bit color S3 Virge based boards [2.7M]",
+ { "S3V", "8, 16 and 24-bit color S3 Virge based boards",
dmenuFlagCheck, dmenuSetFlag, NULL, &XF86ServerDists, '[', 'X', ']', DIST_XF86_SERVER_S3V },
- { "W32", "8-bit ET4000/W32, /W32i and /W32p cards [2.3M]",
+ { "W32", "8-bit ET4000/W32, /W32i and /W32p cards",
dmenuFlagCheck, dmenuSetFlag, NULL, &XF86ServerDists, '[', 'X', ']', DIST_XF86_SERVER_W32 },
- { "nest", "A nested server for testing purposes [1.8M]",
+ { "nest", "A nested server for testing purposes",
dmenuFlagCheck, dmenuSetFlag, NULL, &XF86ServerDists, '[', 'X', ']', DIST_XF86_SERVER_NEST },
- { "vfb", "A virtual frame-buffer server [1.8M]",
+ { "vfb", "A virtual frame-buffer server",
dmenuFlagCheck, dmenuSetFlag, NULL, &XF86ServerDists, '[', 'X', ']', DIST_XF86_SERVER_VFB },
- { "All", "Select all of the above [25M]",
+ { "PC98", "Select an X server for a NEC PC98 [Submenu]",
+ NULL, dmenuSubmenu, NULL, &MenuXF86SelectPC98Server, '>', ' ', '>', 0 },
+ { "All", "Select all of the above",
NULL, setX11Servers, NULL, NULL, ' ', ' ', ' ' },
- { "Clear", "Reset all of the above [0M]",
+ { "Clear", "Reset all of the above",
NULL, clearX11Servers, NULL, NULL, ' ', ' ', ' ' },
{ "Exit", "Exit this menu (returning to previous)",
checkTrue, dmenuExit, NULL, NULL, '<', '<', '<' },
@@ -897,29 +897,29 @@ it is recommended that try the SVGA or VGA16 servers (the VGA16 and\n\
Mono servers are particularly well-suited to most LCD displays).",
"Press F1 to read the XFree86 release notes for FreeBSD",
"XF86",
- { { "9480", "PC98 8-bit (256 color) PEGC-480 card [2.2M]",
+ { { "9480", "PC98 8-bit (256 color) PEGC-480 card",
dmenuFlagCheck, dmenuSetFlag, NULL, &XF86ServerDists, '[', 'X', ']', DIST_XF86_SERVER_9480 },
- { "9EGC", "PC98 4-bit (16 color) EGC card [2.2M]",
+ { "9EGC", "PC98 4-bit (16 color) EGC card",
dmenuFlagCheck, dmenuSetFlag, NULL, &XF86ServerDists, '[', 'X', ']', DIST_XF86_SERVER_9EGC },
- { "9GA9", "PC98 GA-968V4/PCI (S3 968) card [2.2M]",
+ { "9GA9", "PC98 GA-968V4/PCI (S3 968) card",
dmenuFlagCheck, dmenuSetFlag, NULL, &XF86ServerDists, '[', 'X', ']', DIST_XF86_SERVER_9GA9 },
- { "9GAN", "PC98 GANB-WAP (cirrus) card [2.2M]",
+ { "9GAN", "PC98 GANB-WAP (cirrus) card",
dmenuFlagCheck, dmenuSetFlag, NULL, &XF86ServerDists, '[', 'X', ']', DIST_XF86_SERVER_9GAN },
- { "9LPW", "PC98 PowerWindowLB (S3) card [2.2M]",
+ { "9LPW", "PC98 PowerWindowLB (S3) card",
dmenuFlagCheck, dmenuSetFlag, NULL, &XF86ServerDists, '[', 'X', ']', DIST_XF86_SERVER_9LPW },
- { "9NKV", "PC98 NKV-NEC (cirrus) card [2.2M]",
+ { "9NKV", "PC98 NKV-NEC (cirrus) card",
dmenuFlagCheck, dmenuSetFlag, NULL, &XF86ServerDists, '[', 'X', ']', DIST_XF86_SERVER_9NKV },
- { "9NS3", "PC98 NEC (S3) card [2.2M]",
+ { "9NS3", "PC98 NEC (S3) card",
dmenuFlagCheck, dmenuSetFlag, NULL, &XF86ServerDists, '[', 'X', ']', DIST_XF86_SERVER_9NS3 },
- { "9SPW", "PC98 SKB-PowerWindow (S3) card [2.2M]",
+ { "9SPW", "PC98 SKB-PowerWindow (S3) card",
dmenuFlagCheck, dmenuSetFlag, NULL, &XF86ServerDists, '[', 'X', ']', DIST_XF86_SERVER_9SPW },
- { "9TGU", "PC98 Cyber9320 and TGUI9680 cards [2.2M]",
+ { "9TGU", "PC98 Cyber9320 and TGUI9680 cards",
dmenuFlagCheck, dmenuSetFlag, NULL, &XF86ServerDists, '[', 'X', ']', DIST_XF86_SERVER_9TGU },
- { "9WEP", "PC98 WAB-EP (cirrus) card [2.2M]",
+ { "9WEP", "PC98 WAB-EP (cirrus) card",
dmenuFlagCheck, dmenuSetFlag, NULL, &XF86ServerDists, '[', 'X', ']', DIST_XF86_SERVER_9WEP },
- { "9WS", "PC98 WABS (cirrus) card [2.2M]",
+ { "9WS", "PC98 WABS (cirrus) card",
dmenuFlagCheck, dmenuSetFlag, NULL, &XF86ServerDists, '[', 'X', ']', DIST_XF86_SERVER_9WS },
- { "9WSN", "PC98 WSN-A2F (cirrus) card [2.2M]",
+ { "9WSN", "PC98 WSN-A2F (cirrus) card",
dmenuFlagCheck, dmenuSetFlag, NULL, &XF86ServerDists, '[', 'X', ']', DIST_XF86_SERVER_9WSN },
{ "Exit", "Exit this menu (returning to previous)",
checkTrue, dmenuExit, NULL, NULL, '<', '<', '<' },
@@ -969,8 +969,8 @@ DMenu MenuInstallCustom = {
{ { "1 Options", "View/Set various installation options", NULL, optionsEditor },
{ "2 Partition", "Allocate disk space for FreeBSD", NULL, diskPartitionEditor },
{ "3 Label", "Label allocated disk partitions", NULL, diskLabelEditor },
- { "4 Distributions", "Select distribution(s) to extract", NULL, dmenuSubmenu, NULL, &MenuDistributions },
- { "5 Media", "Choose the installation media type", NULL, dmenuSubmenu, NULL, &MenuMedia },
+ { "4 Distributions", "Select distribution(s) to extract", NULL, dmenuSubmenu, NULL, &MenuDistributions },
+ { "5 Media", "Choose the installation media type", NULL, dmenuSubmenu, NULL, &MenuMedia },
{ "6 Commit", "Perform any pending Partition/Label/Extract actions", NULL, installCustomCommit },
{ "7 Extract", "Just do distribution extract step", NULL, distExtractAll },
{ "0 Exit", "Exit this menu (returning to previous)", NULL, dmenuExit },
diff --git a/release/sysinstall/network.c b/release/sysinstall/network.c
index 8b342ff..c5a07b7 100644
--- a/release/sysinstall/network.c
+++ b/release/sysinstall/network.c
@@ -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: network.c,v 1.23 1996/12/11 09:35:03 jkh Exp $
+ * $Id: network.c,v 1.24 1996/12/12 08:23:50 jkh Exp $
*
* Copyright (c) 1995
* Jordan Hubbard. All rights reserved.
@@ -251,6 +251,9 @@ startPPP(Device *devp)
return 0;
}
+ if (isDebug())
+ msgDebug("About to start PPP on device %s @ %s baud. Provider = %s\n", devp->devname, speed, provider);
+
if (!Fake && !(pid = fork())) {
int i, fd;
struct termios foo;
@@ -260,10 +263,11 @@ startPPP(Device *devp)
close(i);
/* We're going over to VTY2 */
- DebugFD = fd = open("/dev/ttyv2", O_RDWR);
+ fd = open("/dev/ttyv2", O_RDWR);
ioctl(0, TIOCSCTTY, &fd);
dup2(0, 1);
dup2(0, 2);
+ DebugFD = 2;
if (login_tty(fd) == -1)
msgDebug("ppp: Can't set the controlling terminal.\n");
signal(SIGTTOU, SIG_IGN);
diff --git a/release/sysinstall/nfs.c b/release/sysinstall/nfs.c
index 8c270f8..3d06440 100644
--- a/release/sysinstall/nfs.c
+++ b/release/sysinstall/nfs.c
@@ -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: nfs.c,v 1.11 1996/08/23 07:55:59 jkh Exp $
+ * $Id: nfs.c,v 1.12 1996/12/11 09:35:04 jkh Exp $
*
* Copyright (c) 1995
* Jordan Hubbard. All rights reserved.
@@ -101,7 +101,7 @@ mediaShutdownNFS(Device *dev)
if (unmount("/dist", MNT_FORCE) != 0)
msgConfirm("Could not unmount the NFS partition: %s", strerror(errno));
msgDebug("Unmount of NFS partition successful\n");
- /* (*netdev->shutdown)(netdev); */
+ /* netdev->shutdown(netdev); */
NFSMounted = FALSE;
return;
}
diff --git a/usr.sbin/sade/menus.c b/usr.sbin/sade/menus.c
index f855faf..708b5c1 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.102 1996/12/29 05:28:41 jkh Exp $
+ * $Id: menus.c,v 1.103 1996/12/29 05:51:37 jkh Exp $
*
* Copyright (c) 1995
* Jordan Hubbard. All rights reserved.
@@ -609,23 +609,23 @@ DMenu MenuDistributions = {
"item or press [ENTER].",
"Press F1 for more information on these options.",
"distributions",
- { { "1 Developer", "Full sources, binaries and doc but no games [180M]",
+ { { "1 Developer", "Full sources, binaries and doc but no games",
checkDistDeveloper, distSetDeveloper },
- { "2 X-Developer", "Same as above, but includes XFree86 [201M]",
+ { "2 X-Developer", "Same as above, but includes XFree86",
checkDistXDeveloper, distSetXDeveloper },
- { "3 Kern-Developer", "Full binaries and doc, kernel sources only [70M]",
+ { "3 Kern-Developer", "Full binaries and doc, kernel sources only",
checkDistKernDeveloper, distSetKernDeveloper },
- { "4 User", "Average user - binaries and doc only [52M]",
+ { "4 User", "Average user - binaries and doc only",
checkDistUser, distSetUser },
- { "5 X-User", "Same as above, but includes XFree86 [52M]",
+ { "5 X-User", "Same as above, but includes XFree86",
checkDistXUser, distSetXUser },
- { "6 Minimal", "The smallest configuration possible [44M]",
+ { "6 Minimal", "The smallest configuration possible",
checkDistMinimum, distSetMinimum },
- { "7 All", "All sources, binaries and XFree86 binaries [700M]",
+ { "7 All", "All sources, binaries and XFree86 binaries",
checkDistEverything, distSetEverything },
- { "8 Custom", "Specify your own distribution set [?]",
+ { "8 Custom", "Specify your own distribution set",
NULL, dmenuSubmenu, NULL, &MenuSubDistributions, '>', '>', '>' },
- { "9 Clear", "Reset selected distribution list to nothing [0M]",
+ { "9 Clear", "Reset selected distribution list to nothing",
NULL, distReset, NULL, NULL, ' ', ' ', ' ' },
{ "0 Exit", "Exit this menu (returning to previous)",
checkTrue, dmenuExit, NULL, NULL, '<', '<', '<' },
@@ -640,37 +640,37 @@ DMenu MenuSubDistributions = {
"DES distribution out of the U.S.! It is for U.S. customers only.",
NULL,
NULL,
- { { "bin", "Binary base distribution (required) [36M]",
+ { { "bin", "Binary base distribution (required)",
dmenuFlagCheck, dmenuSetFlag, NULL, &Dists, '[', 'X', ']', DIST_BIN },
- { "compat1x", "FreeBSD 1.x binary compatibility [2M]",
+ { "compat1x", "FreeBSD 1.x binary compatibility",
dmenuFlagCheck, dmenuSetFlag, NULL, &Dists, '[', 'X', ']', DIST_COMPAT1X },
- { "compat20", "FreeBSD 2.0 binary compatibility [2M]",
+ { "compat20", "FreeBSD 2.0 binary compatibility",
dmenuFlagCheck, dmenuSetFlag, NULL, &Dists, '[', 'X', ']', DIST_COMPAT20 },
- { "compat21", "FreeBSD 2.1 binary compatibility [2M]",
+ { "compat21", "FreeBSD 2.1 binary compatibility",
dmenuFlagCheck, dmenuSetFlag, NULL, &Dists, '[', 'X', ']', DIST_COMPAT21 },
- { "DES", "DES encryption code - NOT FOR EXPORT! [.3M]",
+ { "DES", "DES encryption code - NOT FOR EXPORT!",
DESFlagCheck, distSetDES },
- { "dict", "Spelling checker dictionary files [4.2M]",
+ { "dict", "Spelling checker dictionary files",
dmenuFlagCheck, dmenuSetFlag, NULL, &Dists, '[', 'X', ']', DIST_DICT },
- { "doc", "FreeBSD Handbook and other online docs [10M]",
+ { "doc", "FreeBSD Handbook and other online docs",
dmenuFlagCheck, dmenuSetFlag, NULL, &Dists, '[', 'X', ']', DIST_DOC },
- { "games", "Games (non-commercial) [6.4M]",
+ { "games", "Games (non-commercial)",
dmenuFlagCheck, dmenuSetFlag, NULL, &Dists, '[', 'X', ']', DIST_GAMES },
- { "info", "GNU info files [4.1M]",
+ { "info", "GNU info files",
dmenuFlagCheck, dmenuSetFlag, NULL, &Dists, '[', 'X', ']', DIST_INFO },
- { "man", "System manual pages - recommended [3.3M]",
+ { "man", "System manual pages - recommended",
dmenuFlagCheck, dmenuSetFlag, NULL, &Dists, '[', 'X', ']', DIST_MANPAGES },
- { "catman", "Preformatted system manual pages [3M]",
+ { "catman", "Preformatted system manual pages",
dmenuFlagCheck, dmenuSetFlag, NULL, &Dists, '[', 'X', ']', DIST_CATPAGES },
- { "proflibs", "Profiled versions of the libraries [3.3M]",
+ { "proflibs", "Profiled versions of the libraries",
dmenuFlagCheck, dmenuSetFlag, NULL, &Dists, '[', 'X', ']', DIST_PROFLIBS },
- { "src", "Sources for everything but DES [120M]",
+ { "src", "Sources for everything but DES",
srcFlagCheck, distSetSrc },
{ "XFree86", "The XFree86 3.2 distribution",
x11FlagCheck, distSetXF86 },
- { "All", "All sources, binaries and XFree86 binaries [700M]",
+ { "All", "All sources, binaries and XFree86 binaries",
NULL, distSetEverything, NULL, NULL, ' ', ' ', ' ' },
- { "Clear", "Reset all of the above [0M]",
+ { "Clear", "Reset all of the above",
NULL, distReset, NULL, NULL, ' ', ' ', ' ' },
{ "Exit", "Exit this menu (returning to previous)",
checkTrue, dmenuExit, NULL, NULL, '<', '<', '<' },
@@ -686,13 +686,13 @@ DMenu MenuDESDistributions = {
"distributions of this software, please consult the release notes.",
NULL,
NULL,
- { { "des", "Basic DES encryption services [1M]",
+ { { "des", "Basic DES encryption services",
dmenuFlagCheck, dmenuSetFlag, NULL, &DESDists, '[', 'X', ']', DIST_DES_DES, },
- { "krb", "Kerberos encryption services [2M]",
+ { "krb", "Kerberos encryption services",
dmenuFlagCheck, dmenuSetFlag, NULL, &DESDists, '[', 'X', ']', DIST_DES_KERBEROS },
- { "sebones", "Sources for eBones (Kerberos) [1M]",
+ { "sebones", "Sources for eBones (Kerberos)",
dmenuFlagCheck, dmenuSetFlag, NULL, &DESDists, '[', 'X', ']', DIST_DES_SEBONES },
- { "ssecure", "Sources for DES [1M]",
+ { "ssecure", "Sources for DES",
dmenuFlagCheck, dmenuSetFlag, NULL, &DESDists, '[', 'X', ']', DIST_DES_SSECURE },
{ "Exit", "Exit this menu (returning to previous)",
checkTrue, dmenuExit, NULL, NULL, '<', '<', '<' },
@@ -706,43 +706,43 @@ DMenu MenuSrcDistributions = {
"you wish to install.",
NULL,
NULL,
- { { "base", "top-level files in /usr/src [300K]",
+ { { "base", "top-level files in /usr/src",
dmenuFlagCheck, dmenuSetFlag, NULL, &SrcDists, '[', 'X', ']', DIST_SRC_BASE },
- { "contrib", "/usr/src/contrib (contributed software) [33M]",
+ { "contrib", "/usr/src/contrib (contributed software)",
dmenuFlagCheck, dmenuSetFlag, NULL, &SrcDists, '[', 'X', ']', DIST_SRC_CONTRIB },
- { "gnu", "/usr/src/gnu (software from the GNU Project) [42M]",
+ { "gnu", "/usr/src/gnu (software from the GNU Project)",
dmenuFlagCheck, dmenuSetFlag, NULL, &SrcDists, '[', 'X', ']', DIST_SRC_GNU },
- { "etc", "/usr/src/etc (miscellaneous system files) [460K]",
+ { "etc", "/usr/src/etc (miscellaneous system files)",
dmenuFlagCheck, dmenuSetFlag, NULL, &SrcDists, '[', 'X', ']', DIST_SRC_ETC },
- { "games", "/usr/src/games (the obvious!) [7.8M]",
+ { "games", "/usr/src/games (the obvious!)",
dmenuFlagCheck, dmenuSetFlag, NULL, &SrcDists, '[', 'X', ']', DIST_SRC_GAMES },
- { "include", "/usr/src/include (header files) [467K]",
+ { "include", "/usr/src/include (header files)",
dmenuFlagCheck, dmenuSetFlag, NULL, &SrcDists, '[', 'X', ']', DIST_SRC_INCLUDE },
- { "lib", "/usr/src/lib (system libraries) [9.2M]",
+ { "lib", "/usr/src/lib (system libraries)",
dmenuFlagCheck, dmenuSetFlag, NULL, &SrcDists, '[', 'X', ']', DIST_SRC_LIB },
- { "libexec", "/usr/src/libexec (system programs) [1.2M]",
+ { "libexec", "/usr/src/libexec (system programs)",
dmenuFlagCheck, dmenuSetFlag, NULL, &SrcDists, '[', 'X', ']', DIST_SRC_LIBEXEC },
- { "lkm", "/usr/src/lkm (Loadable Kernel Modules) [193K]",
+ { "lkm", "/usr/src/lkm (Loadable Kernel Modules)",
dmenuFlagCheck, dmenuSetFlag, NULL, &SrcDists, '[', 'X', ']', DIST_SRC_LKM },
- { "release", "/usr/src/release (release-generation tools) [533K]",
+ { "release", "/usr/src/release (release-generation tools)",
dmenuFlagCheck, dmenuSetFlag, NULL, &SrcDists, '[', 'X', ']', DIST_SRC_RELEASE },
- { "bin", "/usr/src/bin (system binaries) [2.5M]",
+ { "bin", "/usr/src/bin (system binaries)",
dmenuFlagCheck, dmenuSetFlag, NULL, &SrcDists, '[', 'X', ']', DIST_SRC_BIN },
- { "sbin", "/usr/src/sbin (system binaries) [1.3M]",
+ { "sbin", "/usr/src/sbin (system binaries)",
dmenuFlagCheck, dmenuSetFlag, NULL, &SrcDists, '[', 'X', ']', DIST_SRC_SBIN },
- { "share", "/usr/src/share (documents and shared files) [10M]",
+ { "share", "/usr/src/share (documents and shared files)",
dmenuFlagCheck, dmenuSetFlag, NULL, &SrcDists, '[', 'X', ']', DIST_SRC_SHARE },
- { "sys", "/usr/src/sys (FreeBSD kernel) [13M]",
+ { "sys", "/usr/src/sys (FreeBSD kernel)",
dmenuFlagCheck, dmenuSetFlag, NULL, &SrcDists, '[', 'X', ']', DIST_SRC_SYS },
- { "ubin", "/usr/src/usr.bin (user binaries) [13M]",
+ { "ubin", "/usr/src/usr.bin (user binaries)",
dmenuFlagCheck, dmenuSetFlag, NULL, &SrcDists, '[', 'X', ']', DIST_SRC_UBIN },
- { "usbin", "/usr/src/usr.sbin (aux system binaries) [14M]",
+ { "usbin", "/usr/src/usr.sbin (aux system binaries)",
dmenuFlagCheck, dmenuSetFlag, NULL, &SrcDists, '[', 'X', ']', DIST_SRC_USBIN },
- { "smailcf", "/usr/src/usr.sbin (sendmail config macros) [341K]",
+ { "smailcf", "/usr/src/usr.sbin (sendmail config macros)",
dmenuFlagCheck, dmenuSetFlag, NULL, &SrcDists, '[', 'X', ']', DIST_SRC_SMAILCF },
- { "All", "Select all of the above [120M]",
+ { "All", "Select all of the above",
NULL, setSrc, NULL, NULL, ' ', ' ', ' ' },
- { "Clear", "Reset all of the above [0M]",
+ { "Clear", "Reset all of the above",
NULL, clearSrc, NULL, NULL, ' ', ' ', ' ' },
{ "Exit", "Exit this menu (returning to previous)",
checkTrue, dmenuExit, NULL, NULL, '<', '<', '<' },
@@ -773,35 +773,35 @@ DMenu MenuXF86SelectCore = {
"Bin, lib, xicf, and xdcf are recommended for a minimum installaion.",
"Press F1 to read the XFree86 release notes for FreeBSD",
"XF86",
- { { "bin", "Client applications and shared libs [4.1M]",
+ { { "bin", "Client applications and shared libs",
dmenuFlagCheck, dmenuSetFlag, NULL, &XF86Dists, '[', 'X', ']', DIST_XF86_BIN },
- { "cfg", "Configuration files [10K]",
+ { "cfg", "Configuration files",
dmenuFlagCheck, dmenuSetFlag, NULL, &XF86Dists, '[', 'X', ']', DIST_XF86_CFG },
- { "doc", "READMEs and release notes [600K]",
+ { "doc", "READMEs and release notes",
dmenuFlagCheck, dmenuSetFlag, NULL, &XF86Dists, '[', 'X', ']', DIST_XF86_DOC },
- { "html", "HTML documentation files [400K]",
+ { "html", "HTML documentation files",
dmenuFlagCheck, dmenuSetFlag, NULL, &XF86Dists, '[', 'X', ']', DIST_XF86_HTML },
- { "lib", "Data files needed at runtime [750K]",
+ { "lib", "Data files needed at runtime",
dmenuFlagCheck, dmenuSetFlag, NULL, &XF86Dists, '[', 'X', ']', DIST_XF86_LIB },
- { "lk98", "Server link kit for PC98 machines [8.8M]",
+ { "lk98", "Server link kit for PC98 machines",
dmenuFlagCheck, dmenuSetFlag, NULL, &XF86Dists, '[', 'X', ']', DIST_XF86_LKIT98 },
- { "lkit", "Server link kit for all other machines [8.8M]",
+ { "lkit", "Server link kit for all other machines",
dmenuFlagCheck, dmenuSetFlag, NULL, &XF86Dists, '[', 'X', ']', DIST_XF86_LKIT },
- { "man", "Manual pages [3M]",
+ { "man", "Manual pages",
dmenuFlagCheck, dmenuSetFlag, NULL, &XF86Dists, '[', 'X', ']', DIST_XF86_MAN },
- { "prog", "Programmer's header and library files [4.1M]",
+ { "prog", "Programmer's header and library files",
dmenuFlagCheck, dmenuSetFlag, NULL, &XF86Dists, '[', 'X', ']', DIST_XF86_PROG },
- { "ps", "Postscript documentation [5M]",
+ { "ps", "Postscript documentation",
dmenuFlagCheck, dmenuSetFlag, NULL, &XF86Dists, '[', 'X', ']', DIST_XF86_PS },
- { "set", "XFree86 Setup Utility [1.0M]",
+ { "set", "XFree86 Setup Utility",
dmenuFlagCheck, dmenuSetFlag, NULL, &XF86Dists, '[', 'X', ']', DIST_XF86_SET },
- { "sources", "XFree86 3.2 standard sources [100M]",
+ { "sources", "XFree86 3.2 standard sources",
dmenuFlagCheck, dmenuSetFlag, NULL, &XF86Dists, '[', 'X', ']', DIST_XF86_SRC },
- { "csources", "XFree86 3.2 contrib sources [100M]",
+ { "csources", "XFree86 3.2 contrib sources",
dmenuFlagCheck, dmenuSetFlag, NULL, &XF86Dists, '[', 'X', ']', DIST_XF86_CSRC },
- { "All", "Select all of the above [20M]",
+ { "All", "Select all of the above",
NULL, setX11Misc, NULL, NULL, ' ', ' ', ' ' },
- { "Clear", "Reset all of the above [0M]",
+ { "Clear", "Reset all of the above",
NULL, clearX11Misc, NULL, NULL, ' ', ' ', ' ' },
{ "Exit", "Exit this menu (returning to previous)",
checkTrue, dmenuExit, NULL, NULL, '<', '<', '<' },
@@ -817,21 +817,21 @@ install. At the minimum, you should install the standard\n\
(these are selected by default).",
"Press F1 to read the XFree86 release notes for FreeBSD",
"XF86",
- { { "fnts", "Standard 75 DPI and miscellaneous fonts [3.6M]",
+ { { "fnts", "Standard 75 DPI and miscellaneous fonts",
dmenuFlagCheck, dmenuSetFlag, NULL, &XF86FontDists, '[', 'X', ']', DIST_XF86_FONTS_MISC },
- { "f100", "100 DPI fonts [1.8M]",
+ { "f100", "100 DPI fonts",
dmenuFlagCheck, dmenuSetFlag, NULL, &XF86FontDists, '[', 'X', ']', DIST_XF86_FONTS_100 },
- { "fcyr", "Cyrillic Fonts [1.8M]",
+ { "fcyr", "Cyrillic Fonts",
dmenuFlagCheck, dmenuSetFlag, NULL, &XF86FontDists, '[', 'X', ']', DIST_XF86_FONTS_CYR },
- { "fscl", "Speedo and Type scalable fonts [1.6M]",
+ { "fscl", "Speedo and Type scalable fonts",
dmenuFlagCheck, dmenuSetFlag, NULL, &XF86FontDists, '[', 'X', ']', DIST_XF86_FONTS_SCALE },
- { "non", "Japanese, Chinese and other non-english fonts [3.3M]",
+ { "non", "Japanese, Chinese and other non-english fonts",
dmenuFlagCheck, dmenuSetFlag, NULL, &XF86FontDists, '[', 'X', ']', DIST_XF86_FONTS_NON },
- { "server", "Font server [0.3M]",
+ { "server", "Font server",
dmenuFlagCheck, dmenuSetFlag, NULL, &XF86FontDists, '[', 'X', ']', DIST_XF86_FONTS_SERVER },
- { "All", "All fonts [10M]",
+ { "All", "All fonts",
NULL, setX11Fonts, NULL, NULL, ' ', ' ', ' ' },
- { "Clear", "Reset font selections [0M]",
+ { "Clear", "Reset font selections",
NULL, clearX11Fonts, NULL, NULL, ' ', ' ', ' ' },
{ "Exit", "Exit this menu (returning to previous)",
checkTrue, dmenuExit, NULL, NULL, '<', '<', '<' },
@@ -847,41 +847,41 @@ DMenu MenuXF86SelectServer = {
"machines, the 9EGC or 9840 servers.",
"Press F1 to read the XFree86 release notes for FreeBSD",
"XF86",
- { { "SVGA", "Standard VGA or Super VGA card [2.8M]",
+ { { "SVGA", "Standard VGA or Super VGA card",
dmenuFlagCheck, dmenuSetFlag, NULL, &XF86ServerDists, '[', 'X', ']', DIST_XF86_SERVER_SVGA },
- { "VGA16", "Standard 16 color VGA card [1.3M]",
+ { "VGA16", "Standard 16 color VGA card",
dmenuFlagCheck, dmenuSetFlag, NULL, &XF86ServerDists, '[', 'X', ']', DIST_XF86_SERVER_VGA16 },
- { "Mono", "Standard Monochrome card [1.3M]",
+ { "Mono", "Standard Monochrome card",
dmenuFlagCheck, dmenuSetFlag, NULL, &XF86ServerDists, '[', 'X', ']', DIST_XF86_SERVER_MONO },
- { "PC98", "Select an X server for a NEC PC98 [Submenu]",
- NULL, dmenuSubmenu, NULL, &MenuXF86SelectPC98Server, '>', ' ', '>', 0 },
- { "8514", "8-bit (256 color) IBM 8514 or compatible card [2.2M]",
+ { "8514", "8-bit (256 color) IBM 8514 or compatible card",
dmenuFlagCheck, dmenuSetFlag, NULL, &XF86ServerDists, '[', 'X', ']', DIST_XF86_SERVER_8514 },
- { "AGX", "8-bit AGX card [2.4M]",
+ { "AGX", "8-bit AGX card",
dmenuFlagCheck, dmenuSetFlag, NULL, &XF86ServerDists, '[', 'X', ']', DIST_XF86_SERVER_AGX },
- { "I128", "8, 16 and 24-bit #9 Imagine I128 card [2.4M]",
+ { "I128", "8, 16 and 24-bit #9 Imagine I128 card",
dmenuFlagCheck, dmenuSetFlag, NULL, &XF86ServerDists, '[', 'X', ']', DIST_XF86_SERVER_I128 },
- { "Ma8", "8-bit ATI Mach8 card [2.3M]",
+ { "Ma8", "8-bit ATI Mach8 card",
dmenuFlagCheck, dmenuSetFlag, NULL, &XF86ServerDists, '[', 'X', ']', DIST_XF86_SERVER_MACH8 },
- { "Ma32", "8 and 16-bit (65K color) ATI Mach32 card [2.4M]",
+ { "Ma32", "8 and 16-bit (65K color) ATI Mach32 card",
dmenuFlagCheck, dmenuSetFlag, NULL, &XF86ServerDists, '[', 'X', ']', DIST_XF86_SERVER_MACH32 },
- { "Ma64", "8 and 16-bit (65K color) ATI Mach64 card [2.5M]",
+ { "Ma64", "8 and 16-bit (65K color) ATI Mach64 card",
dmenuFlagCheck, dmenuSetFlag, NULL, &XF86ServerDists, '[', 'X', ']', DIST_XF86_SERVER_MACH64 },
- { "P9K", "8, 16, and 24-bit color Weitek P9000 based boards [2.5M]",
+ { "P9K", "8, 16, and 24-bit color Weitek P9000 based boards",
dmenuFlagCheck, dmenuSetFlag, NULL, &XF86ServerDists, '[', 'X', ']', DIST_XF86_SERVER_P9000 },
- { "S3", "8, 16 and 24-bit color S3 based boards [2.7M]",
+ { "S3", "8, 16 and 24-bit color S3 based boards",
dmenuFlagCheck, dmenuSetFlag, NULL, &XF86ServerDists, '[', 'X', ']', DIST_XF86_SERVER_S3 },
- { "S3V", "8, 16 and 24-bit color S3 Virge based boards [2.7M]",
+ { "S3V", "8, 16 and 24-bit color S3 Virge based boards",
dmenuFlagCheck, dmenuSetFlag, NULL, &XF86ServerDists, '[', 'X', ']', DIST_XF86_SERVER_S3V },
- { "W32", "8-bit ET4000/W32, /W32i and /W32p cards [2.3M]",
+ { "W32", "8-bit ET4000/W32, /W32i and /W32p cards",
dmenuFlagCheck, dmenuSetFlag, NULL, &XF86ServerDists, '[', 'X', ']', DIST_XF86_SERVER_W32 },
- { "nest", "A nested server for testing purposes [1.8M]",
+ { "nest", "A nested server for testing purposes",
dmenuFlagCheck, dmenuSetFlag, NULL, &XF86ServerDists, '[', 'X', ']', DIST_XF86_SERVER_NEST },
- { "vfb", "A virtual frame-buffer server [1.8M]",
+ { "vfb", "A virtual frame-buffer server",
dmenuFlagCheck, dmenuSetFlag, NULL, &XF86ServerDists, '[', 'X', ']', DIST_XF86_SERVER_VFB },
- { "All", "Select all of the above [25M]",
+ { "PC98", "Select an X server for a NEC PC98 [Submenu]",
+ NULL, dmenuSubmenu, NULL, &MenuXF86SelectPC98Server, '>', ' ', '>', 0 },
+ { "All", "Select all of the above",
NULL, setX11Servers, NULL, NULL, ' ', ' ', ' ' },
- { "Clear", "Reset all of the above [0M]",
+ { "Clear", "Reset all of the above",
NULL, clearX11Servers, NULL, NULL, ' ', ' ', ' ' },
{ "Exit", "Exit this menu (returning to previous)",
checkTrue, dmenuExit, NULL, NULL, '<', '<', '<' },
@@ -897,29 +897,29 @@ it is recommended that try the SVGA or VGA16 servers (the VGA16 and\n\
Mono servers are particularly well-suited to most LCD displays).",
"Press F1 to read the XFree86 release notes for FreeBSD",
"XF86",
- { { "9480", "PC98 8-bit (256 color) PEGC-480 card [2.2M]",
+ { { "9480", "PC98 8-bit (256 color) PEGC-480 card",
dmenuFlagCheck, dmenuSetFlag, NULL, &XF86ServerDists, '[', 'X', ']', DIST_XF86_SERVER_9480 },
- { "9EGC", "PC98 4-bit (16 color) EGC card [2.2M]",
+ { "9EGC", "PC98 4-bit (16 color) EGC card",
dmenuFlagCheck, dmenuSetFlag, NULL, &XF86ServerDists, '[', 'X', ']', DIST_XF86_SERVER_9EGC },
- { "9GA9", "PC98 GA-968V4/PCI (S3 968) card [2.2M]",
+ { "9GA9", "PC98 GA-968V4/PCI (S3 968) card",
dmenuFlagCheck, dmenuSetFlag, NULL, &XF86ServerDists, '[', 'X', ']', DIST_XF86_SERVER_9GA9 },
- { "9GAN", "PC98 GANB-WAP (cirrus) card [2.2M]",
+ { "9GAN", "PC98 GANB-WAP (cirrus) card",
dmenuFlagCheck, dmenuSetFlag, NULL, &XF86ServerDists, '[', 'X', ']', DIST_XF86_SERVER_9GAN },
- { "9LPW", "PC98 PowerWindowLB (S3) card [2.2M]",
+ { "9LPW", "PC98 PowerWindowLB (S3) card",
dmenuFlagCheck, dmenuSetFlag, NULL, &XF86ServerDists, '[', 'X', ']', DIST_XF86_SERVER_9LPW },
- { "9NKV", "PC98 NKV-NEC (cirrus) card [2.2M]",
+ { "9NKV", "PC98 NKV-NEC (cirrus) card",
dmenuFlagCheck, dmenuSetFlag, NULL, &XF86ServerDists, '[', 'X', ']', DIST_XF86_SERVER_9NKV },
- { "9NS3", "PC98 NEC (S3) card [2.2M]",
+ { "9NS3", "PC98 NEC (S3) card",
dmenuFlagCheck, dmenuSetFlag, NULL, &XF86ServerDists, '[', 'X', ']', DIST_XF86_SERVER_9NS3 },
- { "9SPW", "PC98 SKB-PowerWindow (S3) card [2.2M]",
+ { "9SPW", "PC98 SKB-PowerWindow (S3) card",
dmenuFlagCheck, dmenuSetFlag, NULL, &XF86ServerDists, '[', 'X', ']', DIST_XF86_SERVER_9SPW },
- { "9TGU", "PC98 Cyber9320 and TGUI9680 cards [2.2M]",
+ { "9TGU", "PC98 Cyber9320 and TGUI9680 cards",
dmenuFlagCheck, dmenuSetFlag, NULL, &XF86ServerDists, '[', 'X', ']', DIST_XF86_SERVER_9TGU },
- { "9WEP", "PC98 WAB-EP (cirrus) card [2.2M]",
+ { "9WEP", "PC98 WAB-EP (cirrus) card",
dmenuFlagCheck, dmenuSetFlag, NULL, &XF86ServerDists, '[', 'X', ']', DIST_XF86_SERVER_9WEP },
- { "9WS", "PC98 WABS (cirrus) card [2.2M]",
+ { "9WS", "PC98 WABS (cirrus) card",
dmenuFlagCheck, dmenuSetFlag, NULL, &XF86ServerDists, '[', 'X', ']', DIST_XF86_SERVER_9WS },
- { "9WSN", "PC98 WSN-A2F (cirrus) card [2.2M]",
+ { "9WSN", "PC98 WSN-A2F (cirrus) card",
dmenuFlagCheck, dmenuSetFlag, NULL, &XF86ServerDists, '[', 'X', ']', DIST_XF86_SERVER_9WSN },
{ "Exit", "Exit this menu (returning to previous)",
checkTrue, dmenuExit, NULL, NULL, '<', '<', '<' },
@@ -969,8 +969,8 @@ DMenu MenuInstallCustom = {
{ { "1 Options", "View/Set various installation options", NULL, optionsEditor },
{ "2 Partition", "Allocate disk space for FreeBSD", NULL, diskPartitionEditor },
{ "3 Label", "Label allocated disk partitions", NULL, diskLabelEditor },
- { "4 Distributions", "Select distribution(s) to extract", NULL, dmenuSubmenu, NULL, &MenuDistributions },
- { "5 Media", "Choose the installation media type", NULL, dmenuSubmenu, NULL, &MenuMedia },
+ { "4 Distributions", "Select distribution(s) to extract", NULL, dmenuSubmenu, NULL, &MenuDistributions },
+ { "5 Media", "Choose the installation media type", NULL, dmenuSubmenu, NULL, &MenuMedia },
{ "6 Commit", "Perform any pending Partition/Label/Extract actions", NULL, installCustomCommit },
{ "7 Extract", "Just do distribution extract step", NULL, distExtractAll },
{ "0 Exit", "Exit this menu (returning to previous)", NULL, dmenuExit },
diff --git a/usr.sbin/sysinstall/cdrom.c b/usr.sbin/sysinstall/cdrom.c
index 6ab57c2..9756102 100644
--- a/usr.sbin/sysinstall/cdrom.c
+++ b/usr.sbin/sysinstall/cdrom.c
@@ -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: cdrom.c,v 1.29 1996/12/12 08:33:35 jkh Exp $
+ * $Id: cdrom.c,v 1.30 1996/12/12 16:55:37 jkh Exp $
*
* Copyright (c) 1995
* Jordan Hubbard. All rights reserved.
@@ -107,7 +107,8 @@ mediaInitCDROM(Device *dev)
cdromMounted = CD_ALREADY_MOUNTED;
if (!dontRead && (DITEM_STATUS(attr_parse_file(cd_attr, "/cdrom/cdrom.inf")) == DITEM_FAILURE ||
!(cp = attr_match(cd_attr, "CD_VERSION")) || strcmp(cp, variable_get(VAR_RELNAME)))) {
- unmount("/cdrom", MNT_FORCE);
+ if (cdromMounted != CD_ALREADY_MOUNTED)
+ unmount("/cdrom", MNT_FORCE);
if (!cp)
msgConfirm("Unable to find a /cdrom/cdrom.inf file.\n"
"Either this is not a FreeBSD CDROM, there is a problem with\n"
@@ -120,7 +121,8 @@ mediaInitCDROM(Device *dev)
"(%s).\n\n"
"If this is intentional, then please visit the Options editor\n"
"to set the boot floppy version string to match that of the CD\n"
- "before selecting it as an installation media to avoid this warning", cp, variable_get(VAR_RELNAME));
+ "before selecting it as an installation media.", cp, variable_get(VAR_RELNAME));
+ return FALSE;
}
msgDebug("Mounted FreeBSD CDROM on device %s as /cdrom\n", dev->devname);
return TRUE;
diff --git a/usr.sbin/sysinstall/ftp.c b/usr.sbin/sysinstall/ftp.c
index 2810e98..0ba3fe0 100644
--- a/usr.sbin/sysinstall/ftp.c
+++ b/usr.sbin/sysinstall/ftp.c
@@ -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: ftp.c,v 1.19 1996/12/11 09:34:59 jkh Exp $
+ * $Id: ftp.c,v 1.20 1996/12/11 19:35:26 jkh Exp $
*
* Copyright (c) 1995
* Jordan Hubbard. All rights reserved.
@@ -55,6 +55,7 @@ mediaInitFTP(Device *dev)
int i, code;
char *cp, *rel, *hostname, *dir;
char *user, *login_name, password[80];
+ Device *netdev = (Device *)dev->private;
if (ftpInitted)
return TRUE;
@@ -67,6 +68,10 @@ mediaInitFTP(Device *dev)
OpenConn = NULL;
}
+ /* If we can't initialize the network, bag it! */
+ if (!netdev->init(netdev))
+ return FALSE;
+
try:
cp = variable_get(VAR_FTP_PATH);
if (!cp) {
@@ -80,10 +85,8 @@ try:
msgFatal("Missing FTP host or directory specification - something's wrong!");
user = variable_get(VAR_FTP_USER);
- if (!user || !*user)
- login_name = "anonymous";
- else
- login_name = user;
+ login_name = (!user || !*user) ? "anonymous" : user;
+
if (variable_get(VAR_FTP_PASS))
SAFE_STRCPY(password, variable_get(VAR_FTP_PASS));
else
@@ -216,6 +219,6 @@ mediaShutdownFTP(Device *dev)
fclose(OpenConn);
OpenConn = NULL;
}
- /* (*netdev->shutdown)(netdev); */
+ /* netdev->shutdown(netdev); */
ftpInitted = FALSE;
}
diff --git a/usr.sbin/sysinstall/menus.c b/usr.sbin/sysinstall/menus.c
index f855faf..708b5c1 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.102 1996/12/29 05:28:41 jkh Exp $
+ * $Id: menus.c,v 1.103 1996/12/29 05:51:37 jkh Exp $
*
* Copyright (c) 1995
* Jordan Hubbard. All rights reserved.
@@ -609,23 +609,23 @@ DMenu MenuDistributions = {
"item or press [ENTER].",
"Press F1 for more information on these options.",
"distributions",
- { { "1 Developer", "Full sources, binaries and doc but no games [180M]",
+ { { "1 Developer", "Full sources, binaries and doc but no games",
checkDistDeveloper, distSetDeveloper },
- { "2 X-Developer", "Same as above, but includes XFree86 [201M]",
+ { "2 X-Developer", "Same as above, but includes XFree86",
checkDistXDeveloper, distSetXDeveloper },
- { "3 Kern-Developer", "Full binaries and doc, kernel sources only [70M]",
+ { "3 Kern-Developer", "Full binaries and doc, kernel sources only",
checkDistKernDeveloper, distSetKernDeveloper },
- { "4 User", "Average user - binaries and doc only [52M]",
+ { "4 User", "Average user - binaries and doc only",
checkDistUser, distSetUser },
- { "5 X-User", "Same as above, but includes XFree86 [52M]",
+ { "5 X-User", "Same as above, but includes XFree86",
checkDistXUser, distSetXUser },
- { "6 Minimal", "The smallest configuration possible [44M]",
+ { "6 Minimal", "The smallest configuration possible",
checkDistMinimum, distSetMinimum },
- { "7 All", "All sources, binaries and XFree86 binaries [700M]",
+ { "7 All", "All sources, binaries and XFree86 binaries",
checkDistEverything, distSetEverything },
- { "8 Custom", "Specify your own distribution set [?]",
+ { "8 Custom", "Specify your own distribution set",
NULL, dmenuSubmenu, NULL, &MenuSubDistributions, '>', '>', '>' },
- { "9 Clear", "Reset selected distribution list to nothing [0M]",
+ { "9 Clear", "Reset selected distribution list to nothing",
NULL, distReset, NULL, NULL, ' ', ' ', ' ' },
{ "0 Exit", "Exit this menu (returning to previous)",
checkTrue, dmenuExit, NULL, NULL, '<', '<', '<' },
@@ -640,37 +640,37 @@ DMenu MenuSubDistributions = {
"DES distribution out of the U.S.! It is for U.S. customers only.",
NULL,
NULL,
- { { "bin", "Binary base distribution (required) [36M]",
+ { { "bin", "Binary base distribution (required)",
dmenuFlagCheck, dmenuSetFlag, NULL, &Dists, '[', 'X', ']', DIST_BIN },
- { "compat1x", "FreeBSD 1.x binary compatibility [2M]",
+ { "compat1x", "FreeBSD 1.x binary compatibility",
dmenuFlagCheck, dmenuSetFlag, NULL, &Dists, '[', 'X', ']', DIST_COMPAT1X },
- { "compat20", "FreeBSD 2.0 binary compatibility [2M]",
+ { "compat20", "FreeBSD 2.0 binary compatibility",
dmenuFlagCheck, dmenuSetFlag, NULL, &Dists, '[', 'X', ']', DIST_COMPAT20 },
- { "compat21", "FreeBSD 2.1 binary compatibility [2M]",
+ { "compat21", "FreeBSD 2.1 binary compatibility",
dmenuFlagCheck, dmenuSetFlag, NULL, &Dists, '[', 'X', ']', DIST_COMPAT21 },
- { "DES", "DES encryption code - NOT FOR EXPORT! [.3M]",
+ { "DES", "DES encryption code - NOT FOR EXPORT!",
DESFlagCheck, distSetDES },
- { "dict", "Spelling checker dictionary files [4.2M]",
+ { "dict", "Spelling checker dictionary files",
dmenuFlagCheck, dmenuSetFlag, NULL, &Dists, '[', 'X', ']', DIST_DICT },
- { "doc", "FreeBSD Handbook and other online docs [10M]",
+ { "doc", "FreeBSD Handbook and other online docs",
dmenuFlagCheck, dmenuSetFlag, NULL, &Dists, '[', 'X', ']', DIST_DOC },
- { "games", "Games (non-commercial) [6.4M]",
+ { "games", "Games (non-commercial)",
dmenuFlagCheck, dmenuSetFlag, NULL, &Dists, '[', 'X', ']', DIST_GAMES },
- { "info", "GNU info files [4.1M]",
+ { "info", "GNU info files",
dmenuFlagCheck, dmenuSetFlag, NULL, &Dists, '[', 'X', ']', DIST_INFO },
- { "man", "System manual pages - recommended [3.3M]",
+ { "man", "System manual pages - recommended",
dmenuFlagCheck, dmenuSetFlag, NULL, &Dists, '[', 'X', ']', DIST_MANPAGES },
- { "catman", "Preformatted system manual pages [3M]",
+ { "catman", "Preformatted system manual pages",
dmenuFlagCheck, dmenuSetFlag, NULL, &Dists, '[', 'X', ']', DIST_CATPAGES },
- { "proflibs", "Profiled versions of the libraries [3.3M]",
+ { "proflibs", "Profiled versions of the libraries",
dmenuFlagCheck, dmenuSetFlag, NULL, &Dists, '[', 'X', ']', DIST_PROFLIBS },
- { "src", "Sources for everything but DES [120M]",
+ { "src", "Sources for everything but DES",
srcFlagCheck, distSetSrc },
{ "XFree86", "The XFree86 3.2 distribution",
x11FlagCheck, distSetXF86 },
- { "All", "All sources, binaries and XFree86 binaries [700M]",
+ { "All", "All sources, binaries and XFree86 binaries",
NULL, distSetEverything, NULL, NULL, ' ', ' ', ' ' },
- { "Clear", "Reset all of the above [0M]",
+ { "Clear", "Reset all of the above",
NULL, distReset, NULL, NULL, ' ', ' ', ' ' },
{ "Exit", "Exit this menu (returning to previous)",
checkTrue, dmenuExit, NULL, NULL, '<', '<', '<' },
@@ -686,13 +686,13 @@ DMenu MenuDESDistributions = {
"distributions of this software, please consult the release notes.",
NULL,
NULL,
- { { "des", "Basic DES encryption services [1M]",
+ { { "des", "Basic DES encryption services",
dmenuFlagCheck, dmenuSetFlag, NULL, &DESDists, '[', 'X', ']', DIST_DES_DES, },
- { "krb", "Kerberos encryption services [2M]",
+ { "krb", "Kerberos encryption services",
dmenuFlagCheck, dmenuSetFlag, NULL, &DESDists, '[', 'X', ']', DIST_DES_KERBEROS },
- { "sebones", "Sources for eBones (Kerberos) [1M]",
+ { "sebones", "Sources for eBones (Kerberos)",
dmenuFlagCheck, dmenuSetFlag, NULL, &DESDists, '[', 'X', ']', DIST_DES_SEBONES },
- { "ssecure", "Sources for DES [1M]",
+ { "ssecure", "Sources for DES",
dmenuFlagCheck, dmenuSetFlag, NULL, &DESDists, '[', 'X', ']', DIST_DES_SSECURE },
{ "Exit", "Exit this menu (returning to previous)",
checkTrue, dmenuExit, NULL, NULL, '<', '<', '<' },
@@ -706,43 +706,43 @@ DMenu MenuSrcDistributions = {
"you wish to install.",
NULL,
NULL,
- { { "base", "top-level files in /usr/src [300K]",
+ { { "base", "top-level files in /usr/src",
dmenuFlagCheck, dmenuSetFlag, NULL, &SrcDists, '[', 'X', ']', DIST_SRC_BASE },
- { "contrib", "/usr/src/contrib (contributed software) [33M]",
+ { "contrib", "/usr/src/contrib (contributed software)",
dmenuFlagCheck, dmenuSetFlag, NULL, &SrcDists, '[', 'X', ']', DIST_SRC_CONTRIB },
- { "gnu", "/usr/src/gnu (software from the GNU Project) [42M]",
+ { "gnu", "/usr/src/gnu (software from the GNU Project)",
dmenuFlagCheck, dmenuSetFlag, NULL, &SrcDists, '[', 'X', ']', DIST_SRC_GNU },
- { "etc", "/usr/src/etc (miscellaneous system files) [460K]",
+ { "etc", "/usr/src/etc (miscellaneous system files)",
dmenuFlagCheck, dmenuSetFlag, NULL, &SrcDists, '[', 'X', ']', DIST_SRC_ETC },
- { "games", "/usr/src/games (the obvious!) [7.8M]",
+ { "games", "/usr/src/games (the obvious!)",
dmenuFlagCheck, dmenuSetFlag, NULL, &SrcDists, '[', 'X', ']', DIST_SRC_GAMES },
- { "include", "/usr/src/include (header files) [467K]",
+ { "include", "/usr/src/include (header files)",
dmenuFlagCheck, dmenuSetFlag, NULL, &SrcDists, '[', 'X', ']', DIST_SRC_INCLUDE },
- { "lib", "/usr/src/lib (system libraries) [9.2M]",
+ { "lib", "/usr/src/lib (system libraries)",
dmenuFlagCheck, dmenuSetFlag, NULL, &SrcDists, '[', 'X', ']', DIST_SRC_LIB },
- { "libexec", "/usr/src/libexec (system programs) [1.2M]",
+ { "libexec", "/usr/src/libexec (system programs)",
dmenuFlagCheck, dmenuSetFlag, NULL, &SrcDists, '[', 'X', ']', DIST_SRC_LIBEXEC },
- { "lkm", "/usr/src/lkm (Loadable Kernel Modules) [193K]",
+ { "lkm", "/usr/src/lkm (Loadable Kernel Modules)",
dmenuFlagCheck, dmenuSetFlag, NULL, &SrcDists, '[', 'X', ']', DIST_SRC_LKM },
- { "release", "/usr/src/release (release-generation tools) [533K]",
+ { "release", "/usr/src/release (release-generation tools)",
dmenuFlagCheck, dmenuSetFlag, NULL, &SrcDists, '[', 'X', ']', DIST_SRC_RELEASE },
- { "bin", "/usr/src/bin (system binaries) [2.5M]",
+ { "bin", "/usr/src/bin (system binaries)",
dmenuFlagCheck, dmenuSetFlag, NULL, &SrcDists, '[', 'X', ']', DIST_SRC_BIN },
- { "sbin", "/usr/src/sbin (system binaries) [1.3M]",
+ { "sbin", "/usr/src/sbin (system binaries)",
dmenuFlagCheck, dmenuSetFlag, NULL, &SrcDists, '[', 'X', ']', DIST_SRC_SBIN },
- { "share", "/usr/src/share (documents and shared files) [10M]",
+ { "share", "/usr/src/share (documents and shared files)",
dmenuFlagCheck, dmenuSetFlag, NULL, &SrcDists, '[', 'X', ']', DIST_SRC_SHARE },
- { "sys", "/usr/src/sys (FreeBSD kernel) [13M]",
+ { "sys", "/usr/src/sys (FreeBSD kernel)",
dmenuFlagCheck, dmenuSetFlag, NULL, &SrcDists, '[', 'X', ']', DIST_SRC_SYS },
- { "ubin", "/usr/src/usr.bin (user binaries) [13M]",
+ { "ubin", "/usr/src/usr.bin (user binaries)",
dmenuFlagCheck, dmenuSetFlag, NULL, &SrcDists, '[', 'X', ']', DIST_SRC_UBIN },
- { "usbin", "/usr/src/usr.sbin (aux system binaries) [14M]",
+ { "usbin", "/usr/src/usr.sbin (aux system binaries)",
dmenuFlagCheck, dmenuSetFlag, NULL, &SrcDists, '[', 'X', ']', DIST_SRC_USBIN },
- { "smailcf", "/usr/src/usr.sbin (sendmail config macros) [341K]",
+ { "smailcf", "/usr/src/usr.sbin (sendmail config macros)",
dmenuFlagCheck, dmenuSetFlag, NULL, &SrcDists, '[', 'X', ']', DIST_SRC_SMAILCF },
- { "All", "Select all of the above [120M]",
+ { "All", "Select all of the above",
NULL, setSrc, NULL, NULL, ' ', ' ', ' ' },
- { "Clear", "Reset all of the above [0M]",
+ { "Clear", "Reset all of the above",
NULL, clearSrc, NULL, NULL, ' ', ' ', ' ' },
{ "Exit", "Exit this menu (returning to previous)",
checkTrue, dmenuExit, NULL, NULL, '<', '<', '<' },
@@ -773,35 +773,35 @@ DMenu MenuXF86SelectCore = {
"Bin, lib, xicf, and xdcf are recommended for a minimum installaion.",
"Press F1 to read the XFree86 release notes for FreeBSD",
"XF86",
- { { "bin", "Client applications and shared libs [4.1M]",
+ { { "bin", "Client applications and shared libs",
dmenuFlagCheck, dmenuSetFlag, NULL, &XF86Dists, '[', 'X', ']', DIST_XF86_BIN },
- { "cfg", "Configuration files [10K]",
+ { "cfg", "Configuration files",
dmenuFlagCheck, dmenuSetFlag, NULL, &XF86Dists, '[', 'X', ']', DIST_XF86_CFG },
- { "doc", "READMEs and release notes [600K]",
+ { "doc", "READMEs and release notes",
dmenuFlagCheck, dmenuSetFlag, NULL, &XF86Dists, '[', 'X', ']', DIST_XF86_DOC },
- { "html", "HTML documentation files [400K]",
+ { "html", "HTML documentation files",
dmenuFlagCheck, dmenuSetFlag, NULL, &XF86Dists, '[', 'X', ']', DIST_XF86_HTML },
- { "lib", "Data files needed at runtime [750K]",
+ { "lib", "Data files needed at runtime",
dmenuFlagCheck, dmenuSetFlag, NULL, &XF86Dists, '[', 'X', ']', DIST_XF86_LIB },
- { "lk98", "Server link kit for PC98 machines [8.8M]",
+ { "lk98", "Server link kit for PC98 machines",
dmenuFlagCheck, dmenuSetFlag, NULL, &XF86Dists, '[', 'X', ']', DIST_XF86_LKIT98 },
- { "lkit", "Server link kit for all other machines [8.8M]",
+ { "lkit", "Server link kit for all other machines",
dmenuFlagCheck, dmenuSetFlag, NULL, &XF86Dists, '[', 'X', ']', DIST_XF86_LKIT },
- { "man", "Manual pages [3M]",
+ { "man", "Manual pages",
dmenuFlagCheck, dmenuSetFlag, NULL, &XF86Dists, '[', 'X', ']', DIST_XF86_MAN },
- { "prog", "Programmer's header and library files [4.1M]",
+ { "prog", "Programmer's header and library files",
dmenuFlagCheck, dmenuSetFlag, NULL, &XF86Dists, '[', 'X', ']', DIST_XF86_PROG },
- { "ps", "Postscript documentation [5M]",
+ { "ps", "Postscript documentation",
dmenuFlagCheck, dmenuSetFlag, NULL, &XF86Dists, '[', 'X', ']', DIST_XF86_PS },
- { "set", "XFree86 Setup Utility [1.0M]",
+ { "set", "XFree86 Setup Utility",
dmenuFlagCheck, dmenuSetFlag, NULL, &XF86Dists, '[', 'X', ']', DIST_XF86_SET },
- { "sources", "XFree86 3.2 standard sources [100M]",
+ { "sources", "XFree86 3.2 standard sources",
dmenuFlagCheck, dmenuSetFlag, NULL, &XF86Dists, '[', 'X', ']', DIST_XF86_SRC },
- { "csources", "XFree86 3.2 contrib sources [100M]",
+ { "csources", "XFree86 3.2 contrib sources",
dmenuFlagCheck, dmenuSetFlag, NULL, &XF86Dists, '[', 'X', ']', DIST_XF86_CSRC },
- { "All", "Select all of the above [20M]",
+ { "All", "Select all of the above",
NULL, setX11Misc, NULL, NULL, ' ', ' ', ' ' },
- { "Clear", "Reset all of the above [0M]",
+ { "Clear", "Reset all of the above",
NULL, clearX11Misc, NULL, NULL, ' ', ' ', ' ' },
{ "Exit", "Exit this menu (returning to previous)",
checkTrue, dmenuExit, NULL, NULL, '<', '<', '<' },
@@ -817,21 +817,21 @@ install. At the minimum, you should install the standard\n\
(these are selected by default).",
"Press F1 to read the XFree86 release notes for FreeBSD",
"XF86",
- { { "fnts", "Standard 75 DPI and miscellaneous fonts [3.6M]",
+ { { "fnts", "Standard 75 DPI and miscellaneous fonts",
dmenuFlagCheck, dmenuSetFlag, NULL, &XF86FontDists, '[', 'X', ']', DIST_XF86_FONTS_MISC },
- { "f100", "100 DPI fonts [1.8M]",
+ { "f100", "100 DPI fonts",
dmenuFlagCheck, dmenuSetFlag, NULL, &XF86FontDists, '[', 'X', ']', DIST_XF86_FONTS_100 },
- { "fcyr", "Cyrillic Fonts [1.8M]",
+ { "fcyr", "Cyrillic Fonts",
dmenuFlagCheck, dmenuSetFlag, NULL, &XF86FontDists, '[', 'X', ']', DIST_XF86_FONTS_CYR },
- { "fscl", "Speedo and Type scalable fonts [1.6M]",
+ { "fscl", "Speedo and Type scalable fonts",
dmenuFlagCheck, dmenuSetFlag, NULL, &XF86FontDists, '[', 'X', ']', DIST_XF86_FONTS_SCALE },
- { "non", "Japanese, Chinese and other non-english fonts [3.3M]",
+ { "non", "Japanese, Chinese and other non-english fonts",
dmenuFlagCheck, dmenuSetFlag, NULL, &XF86FontDists, '[', 'X', ']', DIST_XF86_FONTS_NON },
- { "server", "Font server [0.3M]",
+ { "server", "Font server",
dmenuFlagCheck, dmenuSetFlag, NULL, &XF86FontDists, '[', 'X', ']', DIST_XF86_FONTS_SERVER },
- { "All", "All fonts [10M]",
+ { "All", "All fonts",
NULL, setX11Fonts, NULL, NULL, ' ', ' ', ' ' },
- { "Clear", "Reset font selections [0M]",
+ { "Clear", "Reset font selections",
NULL, clearX11Fonts, NULL, NULL, ' ', ' ', ' ' },
{ "Exit", "Exit this menu (returning to previous)",
checkTrue, dmenuExit, NULL, NULL, '<', '<', '<' },
@@ -847,41 +847,41 @@ DMenu MenuXF86SelectServer = {
"machines, the 9EGC or 9840 servers.",
"Press F1 to read the XFree86 release notes for FreeBSD",
"XF86",
- { { "SVGA", "Standard VGA or Super VGA card [2.8M]",
+ { { "SVGA", "Standard VGA or Super VGA card",
dmenuFlagCheck, dmenuSetFlag, NULL, &XF86ServerDists, '[', 'X', ']', DIST_XF86_SERVER_SVGA },
- { "VGA16", "Standard 16 color VGA card [1.3M]",
+ { "VGA16", "Standard 16 color VGA card",
dmenuFlagCheck, dmenuSetFlag, NULL, &XF86ServerDists, '[', 'X', ']', DIST_XF86_SERVER_VGA16 },
- { "Mono", "Standard Monochrome card [1.3M]",
+ { "Mono", "Standard Monochrome card",
dmenuFlagCheck, dmenuSetFlag, NULL, &XF86ServerDists, '[', 'X', ']', DIST_XF86_SERVER_MONO },
- { "PC98", "Select an X server for a NEC PC98 [Submenu]",
- NULL, dmenuSubmenu, NULL, &MenuXF86SelectPC98Server, '>', ' ', '>', 0 },
- { "8514", "8-bit (256 color) IBM 8514 or compatible card [2.2M]",
+ { "8514", "8-bit (256 color) IBM 8514 or compatible card",
dmenuFlagCheck, dmenuSetFlag, NULL, &XF86ServerDists, '[', 'X', ']', DIST_XF86_SERVER_8514 },
- { "AGX", "8-bit AGX card [2.4M]",
+ { "AGX", "8-bit AGX card",
dmenuFlagCheck, dmenuSetFlag, NULL, &XF86ServerDists, '[', 'X', ']', DIST_XF86_SERVER_AGX },
- { "I128", "8, 16 and 24-bit #9 Imagine I128 card [2.4M]",
+ { "I128", "8, 16 and 24-bit #9 Imagine I128 card",
dmenuFlagCheck, dmenuSetFlag, NULL, &XF86ServerDists, '[', 'X', ']', DIST_XF86_SERVER_I128 },
- { "Ma8", "8-bit ATI Mach8 card [2.3M]",
+ { "Ma8", "8-bit ATI Mach8 card",
dmenuFlagCheck, dmenuSetFlag, NULL, &XF86ServerDists, '[', 'X', ']', DIST_XF86_SERVER_MACH8 },
- { "Ma32", "8 and 16-bit (65K color) ATI Mach32 card [2.4M]",
+ { "Ma32", "8 and 16-bit (65K color) ATI Mach32 card",
dmenuFlagCheck, dmenuSetFlag, NULL, &XF86ServerDists, '[', 'X', ']', DIST_XF86_SERVER_MACH32 },
- { "Ma64", "8 and 16-bit (65K color) ATI Mach64 card [2.5M]",
+ { "Ma64", "8 and 16-bit (65K color) ATI Mach64 card",
dmenuFlagCheck, dmenuSetFlag, NULL, &XF86ServerDists, '[', 'X', ']', DIST_XF86_SERVER_MACH64 },
- { "P9K", "8, 16, and 24-bit color Weitek P9000 based boards [2.5M]",
+ { "P9K", "8, 16, and 24-bit color Weitek P9000 based boards",
dmenuFlagCheck, dmenuSetFlag, NULL, &XF86ServerDists, '[', 'X', ']', DIST_XF86_SERVER_P9000 },
- { "S3", "8, 16 and 24-bit color S3 based boards [2.7M]",
+ { "S3", "8, 16 and 24-bit color S3 based boards",
dmenuFlagCheck, dmenuSetFlag, NULL, &XF86ServerDists, '[', 'X', ']', DIST_XF86_SERVER_S3 },
- { "S3V", "8, 16 and 24-bit color S3 Virge based boards [2.7M]",
+ { "S3V", "8, 16 and 24-bit color S3 Virge based boards",
dmenuFlagCheck, dmenuSetFlag, NULL, &XF86ServerDists, '[', 'X', ']', DIST_XF86_SERVER_S3V },
- { "W32", "8-bit ET4000/W32, /W32i and /W32p cards [2.3M]",
+ { "W32", "8-bit ET4000/W32, /W32i and /W32p cards",
dmenuFlagCheck, dmenuSetFlag, NULL, &XF86ServerDists, '[', 'X', ']', DIST_XF86_SERVER_W32 },
- { "nest", "A nested server for testing purposes [1.8M]",
+ { "nest", "A nested server for testing purposes",
dmenuFlagCheck, dmenuSetFlag, NULL, &XF86ServerDists, '[', 'X', ']', DIST_XF86_SERVER_NEST },
- { "vfb", "A virtual frame-buffer server [1.8M]",
+ { "vfb", "A virtual frame-buffer server",
dmenuFlagCheck, dmenuSetFlag, NULL, &XF86ServerDists, '[', 'X', ']', DIST_XF86_SERVER_VFB },
- { "All", "Select all of the above [25M]",
+ { "PC98", "Select an X server for a NEC PC98 [Submenu]",
+ NULL, dmenuSubmenu, NULL, &MenuXF86SelectPC98Server, '>', ' ', '>', 0 },
+ { "All", "Select all of the above",
NULL, setX11Servers, NULL, NULL, ' ', ' ', ' ' },
- { "Clear", "Reset all of the above [0M]",
+ { "Clear", "Reset all of the above",
NULL, clearX11Servers, NULL, NULL, ' ', ' ', ' ' },
{ "Exit", "Exit this menu (returning to previous)",
checkTrue, dmenuExit, NULL, NULL, '<', '<', '<' },
@@ -897,29 +897,29 @@ it is recommended that try the SVGA or VGA16 servers (the VGA16 and\n\
Mono servers are particularly well-suited to most LCD displays).",
"Press F1 to read the XFree86 release notes for FreeBSD",
"XF86",
- { { "9480", "PC98 8-bit (256 color) PEGC-480 card [2.2M]",
+ { { "9480", "PC98 8-bit (256 color) PEGC-480 card",
dmenuFlagCheck, dmenuSetFlag, NULL, &XF86ServerDists, '[', 'X', ']', DIST_XF86_SERVER_9480 },
- { "9EGC", "PC98 4-bit (16 color) EGC card [2.2M]",
+ { "9EGC", "PC98 4-bit (16 color) EGC card",
dmenuFlagCheck, dmenuSetFlag, NULL, &XF86ServerDists, '[', 'X', ']', DIST_XF86_SERVER_9EGC },
- { "9GA9", "PC98 GA-968V4/PCI (S3 968) card [2.2M]",
+ { "9GA9", "PC98 GA-968V4/PCI (S3 968) card",
dmenuFlagCheck, dmenuSetFlag, NULL, &XF86ServerDists, '[', 'X', ']', DIST_XF86_SERVER_9GA9 },
- { "9GAN", "PC98 GANB-WAP (cirrus) card [2.2M]",
+ { "9GAN", "PC98 GANB-WAP (cirrus) card",
dmenuFlagCheck, dmenuSetFlag, NULL, &XF86ServerDists, '[', 'X', ']', DIST_XF86_SERVER_9GAN },
- { "9LPW", "PC98 PowerWindowLB (S3) card [2.2M]",
+ { "9LPW", "PC98 PowerWindowLB (S3) card",
dmenuFlagCheck, dmenuSetFlag, NULL, &XF86ServerDists, '[', 'X', ']', DIST_XF86_SERVER_9LPW },
- { "9NKV", "PC98 NKV-NEC (cirrus) card [2.2M]",
+ { "9NKV", "PC98 NKV-NEC (cirrus) card",
dmenuFlagCheck, dmenuSetFlag, NULL, &XF86ServerDists, '[', 'X', ']', DIST_XF86_SERVER_9NKV },
- { "9NS3", "PC98 NEC (S3) card [2.2M]",
+ { "9NS3", "PC98 NEC (S3) card",
dmenuFlagCheck, dmenuSetFlag, NULL, &XF86ServerDists, '[', 'X', ']', DIST_XF86_SERVER_9NS3 },
- { "9SPW", "PC98 SKB-PowerWindow (S3) card [2.2M]",
+ { "9SPW", "PC98 SKB-PowerWindow (S3) card",
dmenuFlagCheck, dmenuSetFlag, NULL, &XF86ServerDists, '[', 'X', ']', DIST_XF86_SERVER_9SPW },
- { "9TGU", "PC98 Cyber9320 and TGUI9680 cards [2.2M]",
+ { "9TGU", "PC98 Cyber9320 and TGUI9680 cards",
dmenuFlagCheck, dmenuSetFlag, NULL, &XF86ServerDists, '[', 'X', ']', DIST_XF86_SERVER_9TGU },
- { "9WEP", "PC98 WAB-EP (cirrus) card [2.2M]",
+ { "9WEP", "PC98 WAB-EP (cirrus) card",
dmenuFlagCheck, dmenuSetFlag, NULL, &XF86ServerDists, '[', 'X', ']', DIST_XF86_SERVER_9WEP },
- { "9WS", "PC98 WABS (cirrus) card [2.2M]",
+ { "9WS", "PC98 WABS (cirrus) card",
dmenuFlagCheck, dmenuSetFlag, NULL, &XF86ServerDists, '[', 'X', ']', DIST_XF86_SERVER_9WS },
- { "9WSN", "PC98 WSN-A2F (cirrus) card [2.2M]",
+ { "9WSN", "PC98 WSN-A2F (cirrus) card",
dmenuFlagCheck, dmenuSetFlag, NULL, &XF86ServerDists, '[', 'X', ']', DIST_XF86_SERVER_9WSN },
{ "Exit", "Exit this menu (returning to previous)",
checkTrue, dmenuExit, NULL, NULL, '<', '<', '<' },
@@ -969,8 +969,8 @@ DMenu MenuInstallCustom = {
{ { "1 Options", "View/Set various installation options", NULL, optionsEditor },
{ "2 Partition", "Allocate disk space for FreeBSD", NULL, diskPartitionEditor },
{ "3 Label", "Label allocated disk partitions", NULL, diskLabelEditor },
- { "4 Distributions", "Select distribution(s) to extract", NULL, dmenuSubmenu, NULL, &MenuDistributions },
- { "5 Media", "Choose the installation media type", NULL, dmenuSubmenu, NULL, &MenuMedia },
+ { "4 Distributions", "Select distribution(s) to extract", NULL, dmenuSubmenu, NULL, &MenuDistributions },
+ { "5 Media", "Choose the installation media type", NULL, dmenuSubmenu, NULL, &MenuMedia },
{ "6 Commit", "Perform any pending Partition/Label/Extract actions", NULL, installCustomCommit },
{ "7 Extract", "Just do distribution extract step", NULL, distExtractAll },
{ "0 Exit", "Exit this menu (returning to previous)", NULL, dmenuExit },
diff --git a/usr.sbin/sysinstall/network.c b/usr.sbin/sysinstall/network.c
index 8b342ff..c5a07b7 100644
--- a/usr.sbin/sysinstall/network.c
+++ b/usr.sbin/sysinstall/network.c
@@ -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: network.c,v 1.23 1996/12/11 09:35:03 jkh Exp $
+ * $Id: network.c,v 1.24 1996/12/12 08:23:50 jkh Exp $
*
* Copyright (c) 1995
* Jordan Hubbard. All rights reserved.
@@ -251,6 +251,9 @@ startPPP(Device *devp)
return 0;
}
+ if (isDebug())
+ msgDebug("About to start PPP on device %s @ %s baud. Provider = %s\n", devp->devname, speed, provider);
+
if (!Fake && !(pid = fork())) {
int i, fd;
struct termios foo;
@@ -260,10 +263,11 @@ startPPP(Device *devp)
close(i);
/* We're going over to VTY2 */
- DebugFD = fd = open("/dev/ttyv2", O_RDWR);
+ fd = open("/dev/ttyv2", O_RDWR);
ioctl(0, TIOCSCTTY, &fd);
dup2(0, 1);
dup2(0, 2);
+ DebugFD = 2;
if (login_tty(fd) == -1)
msgDebug("ppp: Can't set the controlling terminal.\n");
signal(SIGTTOU, SIG_IGN);
diff --git a/usr.sbin/sysinstall/nfs.c b/usr.sbin/sysinstall/nfs.c
index 8c270f8..3d06440 100644
--- a/usr.sbin/sysinstall/nfs.c
+++ b/usr.sbin/sysinstall/nfs.c
@@ -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: nfs.c,v 1.11 1996/08/23 07:55:59 jkh Exp $
+ * $Id: nfs.c,v 1.12 1996/12/11 09:35:04 jkh Exp $
*
* Copyright (c) 1995
* Jordan Hubbard. All rights reserved.
@@ -101,7 +101,7 @@ mediaShutdownNFS(Device *dev)
if (unmount("/dist", MNT_FORCE) != 0)
msgConfirm("Could not unmount the NFS partition: %s", strerror(errno));
msgDebug("Unmount of NFS partition successful\n");
- /* (*netdev->shutdown)(netdev); */
+ /* netdev->shutdown(netdev); */
NFSMounted = FALSE;
return;
}
OpenPOWER on IntegriCloud