mirror of
https://github.com/freebsd/freebsd-src
synced 2024-09-24 02:34:59 +00:00
1. Take out console setup in options now that Joerg has moved it into
the main menu. 2. Conditionalized a few small things which needed it. 3. Put PC98 X servers in their own menu, there are so many of them now. 4. Rampaged on the menus.c file in general, reformatting and cleaning up.
This commit is contained in:
Jordan K. Hubbard
parent
647518cf5a
commit
2ce9c19184
Notes:
svn2git
2020-12-20 02:59:44 +00:00
svn path=/head/; revision=19577
|
|
@ -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.56 1996/11/07 16:34:12 jkh Exp $
|
||||
* $Id: config.c,v 1.57 1996/11/08 05:38:23 jkh Exp $
|
||||
*
|
||||
* Copyright (c) 1995
|
||||
* Jordan Hubbard. All rights reserved.
|
||||
|
|
@ -542,6 +542,7 @@ configPackages(dialogMenuItem *self)
|
|||
return DITEM_SUCCESS | DITEM_RESTORE | DITEM_RECREATE;
|
||||
}
|
||||
|
||||
#ifdef NETCON_EXTENTIONS
|
||||
/* Load novell client/server package */
|
||||
int
|
||||
configNovell(dialogMenuItem *self)
|
||||
|
|
@ -561,6 +562,7 @@ configNovell(dialogMenuItem *self)
|
|||
}
|
||||
return ret | DITEM_RESTORE;
|
||||
}
|
||||
#endif
|
||||
|
||||
/* Load pcnfsd package */
|
||||
int
|
||||
|
|
|
|||
File diff suppressed because it is too large
Load diff
|
|
@ -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: options.c,v 1.44 1996/10/02 01:30:37 jkh Exp $
|
||||
* $Id: options.c,v 1.45 1996/11/07 08:03:27 jkh Exp $
|
||||
*
|
||||
* Copyright (c) 1995
|
||||
* Jordan Hubbard. All rights reserved.
|
||||
|
|
@ -93,31 +93,6 @@ mediaCheck(Option opt)
|
|||
return "<not yet set>";
|
||||
}
|
||||
|
||||
static char *
|
||||
consoleCheck(Option opt)
|
||||
{
|
||||
static char opts[40];
|
||||
char *cp;
|
||||
|
||||
opts[0] = '\0';
|
||||
cp = variable_get("saver");
|
||||
sprintf(&opts[strlen(opts)], "%s/", cp ?: "std");
|
||||
cp = variable_get("scrnmap");
|
||||
sprintf(&opts[strlen(opts)], "%s/", cp ?: "std");
|
||||
cp = variable_get("font8x8");
|
||||
sprintf(&opts[strlen(opts)], "%s", cp ?: "std");
|
||||
return opts;
|
||||
}
|
||||
|
||||
static int
|
||||
consoleGetType(dialogMenuItem *self)
|
||||
{
|
||||
int i;
|
||||
|
||||
i = dmenuOpenSimple(&MenuSyscons, FALSE) ? DITEM_SUCCESS : DITEM_FAILURE;
|
||||
return i | DITEM_RECREATE;
|
||||
}
|
||||
|
||||
#define TAPE_PROMPT "Please enter the tape block size in 512 byte blocks:"
|
||||
#define RELNAME_PROMPT "Please specify the release you wish to load or\n\"none\" for a generic release install:"
|
||||
#define BPKG_PROMPT "Please specify the name of the HTML browser package:"
|
||||
|
|
@ -153,8 +128,6 @@ static Option Options[] = {
|
|||
OPT_IS_VAR, BBIN_PROMPT, VAR_BROWSER_BINARY, varCheck },
|
||||
{ "Media Type", "The current installation media type.",
|
||||
OPT_IS_FUNC, mediaGetType, VAR_MEDIA_TYPE, mediaCheck },
|
||||
{ "Console Config", "Keyboard and font configuration.",
|
||||
OPT_IS_FUNC, consoleGetType, "System console", consoleCheck },
|
||||
{ "Package Temp", "The directory where package temporary files should go",
|
||||
OPT_IS_VAR, PKG_PROMPT, VAR_PKG_TMPDIR, varCheck },
|
||||
{ "Use Defaults", "Reset all values to startup defaults",
|
||||
|
|
|
|||
|
|
@ -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.85 1996/11/07 08:03:28 jkh Exp $
|
||||
* $Id: sysinstall.h,v 1.86 1996/11/09 16:47:08 joerg Exp $
|
||||
*
|
||||
* Copyright (c) 1995
|
||||
* Jordan Hubbard. All rights reserved.
|
||||
|
|
@ -338,6 +338,7 @@ extern DMenu MenuXF86; /* XFree86 main menu */
|
|||
extern DMenu MenuXF86Select; /* XFree86 distribution selection menu */
|
||||
extern DMenu MenuXF86SelectCore; /* XFree86 core distribution menu */
|
||||
extern DMenu MenuXF86SelectServer; /* XFree86 server distribution menu */
|
||||
extern DMenu MenuXF86SelectPC98Server; /* XFree86 server distribution menu */
|
||||
extern DMenu MenuXF86SelectFonts; /* XFree86 font selection menu */
|
||||
extern DMenu MenuDiskDevices; /* Disk devices menu */
|
||||
extern DMenu MenuHTMLDoc; /* HTML Documentation menu */
|
||||
|
|
@ -381,8 +382,10 @@ extern int configRouter(dialogMenuItem *self);
|
|||
extern int configSamba(dialogMenuItem *self);
|
||||
extern int configPCNFSD(dialogMenuItem *self);
|
||||
extern int configNFSServer(dialogMenuItem *self);
|
||||
extern int configNovell(dialogMenuItem *self);
|
||||
extern int configWriteSysconfig(dialogMenuItem *self);
|
||||
#ifdef NETCON_EXTENTIONS
|
||||
extern int configNovell(dialogMenuItem *self);
|
||||
#endif
|
||||
|
||||
/* crc.c */
|
||||
extern int crc(int, unsigned long *, unsigned long *);
|
||||
|
|
|
|||
|
|
@ -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.56 1996/11/07 16:34:12 jkh Exp $
|
||||
* $Id: config.c,v 1.57 1996/11/08 05:38:23 jkh Exp $
|
||||
*
|
||||
* Copyright (c) 1995
|
||||
* Jordan Hubbard. All rights reserved.
|
||||
|
|
@ -542,6 +542,7 @@ configPackages(dialogMenuItem *self)
|
|||
return DITEM_SUCCESS | DITEM_RESTORE | DITEM_RECREATE;
|
||||
}
|
||||
|
||||
#ifdef NETCON_EXTENTIONS
|
||||
/* Load novell client/server package */
|
||||
int
|
||||
configNovell(dialogMenuItem *self)
|
||||
|
|
@ -561,6 +562,7 @@ configNovell(dialogMenuItem *self)
|
|||
}
|
||||
return ret | DITEM_RESTORE;
|
||||
}
|
||||
#endif
|
||||
|
||||
/* Load pcnfsd package */
|
||||
int
|
||||
|
|
|
|||
File diff suppressed because it is too large
Load diff
|
|
@ -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.85 1996/11/07 08:03:28 jkh Exp $
|
||||
* $Id: sysinstall.h,v 1.86 1996/11/09 16:47:08 joerg Exp $
|
||||
*
|
||||
* Copyright (c) 1995
|
||||
* Jordan Hubbard. All rights reserved.
|
||||
|
|
@ -338,6 +338,7 @@ extern DMenu MenuXF86; /* XFree86 main menu */
|
|||
extern DMenu MenuXF86Select; /* XFree86 distribution selection menu */
|
||||
extern DMenu MenuXF86SelectCore; /* XFree86 core distribution menu */
|
||||
extern DMenu MenuXF86SelectServer; /* XFree86 server distribution menu */
|
||||
extern DMenu MenuXF86SelectPC98Server; /* XFree86 server distribution menu */
|
||||
extern DMenu MenuXF86SelectFonts; /* XFree86 font selection menu */
|
||||
extern DMenu MenuDiskDevices; /* Disk devices menu */
|
||||
extern DMenu MenuHTMLDoc; /* HTML Documentation menu */
|
||||
|
|
@ -381,8 +382,10 @@ extern int configRouter(dialogMenuItem *self);
|
|||
extern int configSamba(dialogMenuItem *self);
|
||||
extern int configPCNFSD(dialogMenuItem *self);
|
||||
extern int configNFSServer(dialogMenuItem *self);
|
||||
extern int configNovell(dialogMenuItem *self);
|
||||
extern int configWriteSysconfig(dialogMenuItem *self);
|
||||
#ifdef NETCON_EXTENTIONS
|
||||
extern int configNovell(dialogMenuItem *self);
|
||||
#endif
|
||||
|
||||
/* crc.c */
|
||||
extern int crc(int, unsigned long *, unsigned long *);
|
||||
|
|
|
|||
|
|
@ -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.56 1996/11/07 16:34:12 jkh Exp $
|
||||
* $Id: config.c,v 1.57 1996/11/08 05:38:23 jkh Exp $
|
||||
*
|
||||
* Copyright (c) 1995
|
||||
* Jordan Hubbard. All rights reserved.
|
||||
|
|
@ -542,6 +542,7 @@ configPackages(dialogMenuItem *self)
|
|||
return DITEM_SUCCESS | DITEM_RESTORE | DITEM_RECREATE;
|
||||
}
|
||||
|
||||
#ifdef NETCON_EXTENTIONS
|
||||
/* Load novell client/server package */
|
||||
int
|
||||
configNovell(dialogMenuItem *self)
|
||||
|
|
@ -561,6 +562,7 @@ configNovell(dialogMenuItem *self)
|
|||
}
|
||||
return ret | DITEM_RESTORE;
|
||||
}
|
||||
#endif
|
||||
|
||||
/* Load pcnfsd package */
|
||||
int
|
||||
|
|
|
|||
File diff suppressed because it is too large
Load diff
|
|
@ -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: options.c,v 1.44 1996/10/02 01:30:37 jkh Exp $
|
||||
* $Id: options.c,v 1.45 1996/11/07 08:03:27 jkh Exp $
|
||||
*
|
||||
* Copyright (c) 1995
|
||||
* Jordan Hubbard. All rights reserved.
|
||||
|
|
@ -93,31 +93,6 @@ mediaCheck(Option opt)
|
|||
return "<not yet set>";
|
||||
}
|
||||
|
||||
static char *
|
||||
consoleCheck(Option opt)
|
||||
{
|
||||
static char opts[40];
|
||||
char *cp;
|
||||
|
||||
opts[0] = '\0';
|
||||
cp = variable_get("saver");
|
||||
sprintf(&opts[strlen(opts)], "%s/", cp ?: "std");
|
||||
cp = variable_get("scrnmap");
|
||||
sprintf(&opts[strlen(opts)], "%s/", cp ?: "std");
|
||||
cp = variable_get("font8x8");
|
||||
sprintf(&opts[strlen(opts)], "%s", cp ?: "std");
|
||||
return opts;
|
||||
}
|
||||
|
||||
static int
|
||||
consoleGetType(dialogMenuItem *self)
|
||||
{
|
||||
int i;
|
||||
|
||||
i = dmenuOpenSimple(&MenuSyscons, FALSE) ? DITEM_SUCCESS : DITEM_FAILURE;
|
||||
return i | DITEM_RECREATE;
|
||||
}
|
||||
|
||||
#define TAPE_PROMPT "Please enter the tape block size in 512 byte blocks:"
|
||||
#define RELNAME_PROMPT "Please specify the release you wish to load or\n\"none\" for a generic release install:"
|
||||
#define BPKG_PROMPT "Please specify the name of the HTML browser package:"
|
||||
|
|
@ -153,8 +128,6 @@ static Option Options[] = {
|
|||
OPT_IS_VAR, BBIN_PROMPT, VAR_BROWSER_BINARY, varCheck },
|
||||
{ "Media Type", "The current installation media type.",
|
||||
OPT_IS_FUNC, mediaGetType, VAR_MEDIA_TYPE, mediaCheck },
|
||||
{ "Console Config", "Keyboard and font configuration.",
|
||||
OPT_IS_FUNC, consoleGetType, "System console", consoleCheck },
|
||||
{ "Package Temp", "The directory where package temporary files should go",
|
||||
OPT_IS_VAR, PKG_PROMPT, VAR_PKG_TMPDIR, varCheck },
|
||||
{ "Use Defaults", "Reset all values to startup defaults",
|
||||
|
|
|
|||
|
|
@ -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.85 1996/11/07 08:03:28 jkh Exp $
|
||||
* $Id: sysinstall.h,v 1.86 1996/11/09 16:47:08 joerg Exp $
|
||||
*
|
||||
* Copyright (c) 1995
|
||||
* Jordan Hubbard. All rights reserved.
|
||||
|
|
@ -338,6 +338,7 @@ extern DMenu MenuXF86; /* XFree86 main menu */
|
|||
extern DMenu MenuXF86Select; /* XFree86 distribution selection menu */
|
||||
extern DMenu MenuXF86SelectCore; /* XFree86 core distribution menu */
|
||||
extern DMenu MenuXF86SelectServer; /* XFree86 server distribution menu */
|
||||
extern DMenu MenuXF86SelectPC98Server; /* XFree86 server distribution menu */
|
||||
extern DMenu MenuXF86SelectFonts; /* XFree86 font selection menu */
|
||||
extern DMenu MenuDiskDevices; /* Disk devices menu */
|
||||
extern DMenu MenuHTMLDoc; /* HTML Documentation menu */
|
||||
|
|
@ -381,8 +382,10 @@ extern int configRouter(dialogMenuItem *self);
|
|||
extern int configSamba(dialogMenuItem *self);
|
||||
extern int configPCNFSD(dialogMenuItem *self);
|
||||
extern int configNFSServer(dialogMenuItem *self);
|
||||
extern int configNovell(dialogMenuItem *self);
|
||||
extern int configWriteSysconfig(dialogMenuItem *self);
|
||||
#ifdef NETCON_EXTENTIONS
|
||||
extern int configNovell(dialogMenuItem *self);
|
||||
#endif
|
||||
|
||||
/* crc.c */
|
||||
extern int crc(int, unsigned long *, unsigned long *);
|
||||
|
|
|
|||
Loading…
Reference in a new issue