1. Make it possible to set up all the TCP/IP values from a script.
2. Update to XFree86 3.3
This commit is contained in:
Jordan K. Hubbard
parent
833bdc932c
commit
d67262d269
@ -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.107 1997/05/05 05:16:01 pst Exp $
|
||||
* $Id: dist.c,v 1.108 1997/06/05 09:47:56 jkh Exp $
|
||||
*
|
||||
* Copyright (c) 1995
|
||||
* Jordan Hubbard. All rights reserved.
|
||||
@ -83,7 +83,7 @@ static Distribution DistTable[] = {
|
||||
#ifdef USE_XIG_ENVIRONMENT
|
||||
{ "accelx", "/usr/X11R6/lib/X11", &Dists, DIST_XIG_SERVER, NULL },
|
||||
#else
|
||||
{ "XF8632", "/usr", &Dists, DIST_XF86, XF86DistTable },
|
||||
{ "XF8633", "/usr", &Dists, DIST_XF86, XF86DistTable },
|
||||
#endif
|
||||
{ NULL },
|
||||
};
|
||||
@ -122,64 +122,64 @@ static Distribution SrcDistTable[] = {
|
||||
#ifndef USE_XIG_ENVIRONMENT
|
||||
/* The XFree86 distribution */
|
||||
static Distribution XF86DistTable[] = {
|
||||
{ "XF8632", "/usr/X11R6", &XF86Dists, DIST_XF86_FONTS, XF86FontDistTable },
|
||||
{ "XF8632", "/usr/X11R6", &XF86Dists, DIST_XF86_SERVER, XF86ServerDistTable },
|
||||
{ "XF8633", "/usr/X11R6", &XF86Dists, DIST_XF86_FONTS, XF86FontDistTable },
|
||||
{ "XF8633", "/usr/X11R6", &XF86Dists, DIST_XF86_SERVER, XF86ServerDistTable },
|
||||
{ "XF86-xc", "/usr/X11R6/src", &XF86Dists, DIST_XF86_SRC, NULL },
|
||||
{ "XF86-co", "/usr/X11R6/src", &XF86Dists, DIST_XF86_CSRC, NULL },
|
||||
{ "X32bin", "/usr/X11R6", &XF86Dists, DIST_XF86_BIN, NULL },
|
||||
{ "X32cfg", "/usr/X11R6", &XF86Dists, DIST_XF86_CFG, NULL },
|
||||
{ "X32doc", "/usr/X11R6", &XF86Dists, DIST_XF86_DOC, NULL },
|
||||
{ "X32html", "/usr/X11R6", &XF86Dists, DIST_XF86_HTML, NULL },
|
||||
{ "X32lib", "/usr/X11R6", &XF86Dists, DIST_XF86_LIB, NULL },
|
||||
{ "X32lk98", "/usr/X11R6", &XF86Dists, DIST_XF86_LKIT98, NULL },
|
||||
{ "X32lkit", "/usr/X11R6", &XF86Dists, DIST_XF86_LKIT, NULL },
|
||||
{ "X32man", "/usr/X11R6", &XF86Dists, DIST_XF86_MAN, NULL },
|
||||
{ "X32prog", "/usr/X11R6", &XF86Dists, DIST_XF86_PROG, NULL },
|
||||
{ "X32ps", "/usr/X11R6", &XF86Dists, DIST_XF86_PS, NULL },
|
||||
{ "X32set", "/usr/X11R6", &XF86Dists, DIST_XF86_SET, NULL },
|
||||
{ "X33bin", "/usr/X11R6", &XF86Dists, DIST_XF86_BIN, NULL },
|
||||
{ "X33cfg", "/usr/X11R6", &XF86Dists, DIST_XF86_CFG, NULL },
|
||||
{ "X33doc", "/usr/X11R6", &XF86Dists, DIST_XF86_DOC, NULL },
|
||||
{ "X33html", "/usr/X11R6", &XF86Dists, DIST_XF86_HTML, NULL },
|
||||
{ "X33lib", "/usr/X11R6", &XF86Dists, DIST_XF86_LIB, NULL },
|
||||
{ "X33lk98", "/usr/X11R6", &XF86Dists, DIST_XF86_LKIT98, NULL },
|
||||
{ "X33lkit", "/usr/X11R6", &XF86Dists, DIST_XF86_LKIT, NULL },
|
||||
{ "X33man", "/usr/X11R6", &XF86Dists, DIST_XF86_MAN, NULL },
|
||||
{ "X33prog", "/usr/X11R6", &XF86Dists, DIST_XF86_PROG, NULL },
|
||||
{ "X33ps", "/usr/X11R6", &XF86Dists, DIST_XF86_PS, NULL },
|
||||
{ "X33set", "/usr/X11R6", &XF86Dists, DIST_XF86_SET, NULL },
|
||||
{ NULL },
|
||||
};
|
||||
|
||||
/* The XFree86 server distribution */
|
||||
static Distribution XF86ServerDistTable[] = {
|
||||
{ "X328514", "/usr/X11R6", &XF86ServerDists, DIST_XF86_SERVER_8514, NULL },
|
||||
{ "X329480", "/usr/X11R6", &XF86ServerDists, DIST_XF86_SERVER_9480, NULL },
|
||||
{ "X329EGC", "/usr/X11R6", &XF86ServerDists, DIST_XF86_SERVER_9EGC, NULL },
|
||||
{ "X329GA9", "/usr/X11R6", &XF86ServerDists, DIST_XF86_SERVER_9GA9, NULL },
|
||||
{ "X329GAN", "/usr/X11R6", &XF86ServerDists, DIST_XF86_SERVER_9GAN, NULL },
|
||||
{ "X329LPW", "/usr/X11R6", &XF86ServerDists, DIST_XF86_SERVER_9LPW, NULL },
|
||||
{ "X329NKV", "/usr/X11R6", &XF86ServerDists, DIST_XF86_SERVER_9NKV, NULL },
|
||||
{ "X329NS3", "/usr/X11R6", &XF86ServerDists, DIST_XF86_SERVER_9NS3, NULL },
|
||||
{ "X329SPW", "/usr/X11R6", &XF86ServerDists, DIST_XF86_SERVER_9SPW, NULL },
|
||||
{ "X329TGU", "/usr/X11R6", &XF86ServerDists, DIST_XF86_SERVER_9TGU, NULL },
|
||||
{ "X329WEP", "/usr/X11R6", &XF86ServerDists, DIST_XF86_SERVER_9WEP, NULL },
|
||||
{ "X329WS", "/usr/X11R6", &XF86ServerDists, DIST_XF86_SERVER_9WS, NULL },
|
||||
{ "X329WSN", "/usr/X11R6", &XF86ServerDists, DIST_XF86_SERVER_9WSN, NULL },
|
||||
{ "X32AGX", "/usr/X11R6", &XF86ServerDists, DIST_XF86_SERVER_AGX, NULL },
|
||||
{ "X32I128", "/usr/X11R6", &XF86ServerDists, DIST_XF86_SERVER_I128, NULL },
|
||||
{ "X32Ma8", "/usr/X11R6", &XF86ServerDists, DIST_XF86_SERVER_MACH8, NULL },
|
||||
{ "X32Ma32", "/usr/X11R6", &XF86ServerDists, DIST_XF86_SERVER_MACH32,NULL },
|
||||
{ "X32Ma64", "/usr/X11R6", &XF86ServerDists, DIST_XF86_SERVER_MACH64,NULL },
|
||||
{ "X32Mono", "/usr/X11R6", &XF86ServerDists, DIST_XF86_SERVER_MONO, NULL },
|
||||
{ "X32P9K", "/usr/X11R6", &XF86ServerDists, DIST_XF86_SERVER_P9000, NULL },
|
||||
{ "X32S3", "/usr/X11R6", &XF86ServerDists, DIST_XF86_SERVER_S3, NULL },
|
||||
{ "X32S3V", "/usr/X11R6", &XF86ServerDists, DIST_XF86_SERVER_S3V, NULL },
|
||||
{ "X32SVGA", "/usr/X11R6", &XF86ServerDists, DIST_XF86_SERVER_SVGA, NULL },
|
||||
{ "X32VG16", "/usr/X11R6", &XF86ServerDists, DIST_XF86_SERVER_VGA16, NULL },
|
||||
{ "X32W32", "/usr/X11R6", &XF86ServerDists, DIST_XF86_SERVER_W32, NULL },
|
||||
{ "X32nest", "/usr/X11R6", &XF86ServerDists, DIST_XF86_SERVER_NEST, NULL },
|
||||
{ "X32vfb", "/usr/X11R6", &XF86ServerDists, DIST_XF86_SERVER_VFB, NULL },
|
||||
{ "X338514", "/usr/X11R6", &XF86ServerDists, DIST_XF86_SERVER_8514, NULL },
|
||||
{ "X339480", "/usr/X11R6", &XF86ServerDists, DIST_XF86_SERVER_9480, NULL },
|
||||
{ "X339EGC", "/usr/X11R6", &XF86ServerDists, DIST_XF86_SERVER_9EGC, NULL },
|
||||
{ "X339GA9", "/usr/X11R6", &XF86ServerDists, DIST_XF86_SERVER_9GA9, NULL },
|
||||
{ "X339GAN", "/usr/X11R6", &XF86ServerDists, DIST_XF86_SERVER_9GAN, NULL },
|
||||
{ "X339LPW", "/usr/X11R6", &XF86ServerDists, DIST_XF86_SERVER_9LPW, NULL },
|
||||
{ "X339NKV", "/usr/X11R6", &XF86ServerDists, DIST_XF86_SERVER_9NKV, NULL },
|
||||
{ "X339NS3", "/usr/X11R6", &XF86ServerDists, DIST_XF86_SERVER_9NS3, NULL },
|
||||
{ "X339SPW", "/usr/X11R6", &XF86ServerDists, DIST_XF86_SERVER_9SPW, NULL },
|
||||
{ "X339TGU", "/usr/X11R6", &XF86ServerDists, DIST_XF86_SERVER_9TGU, NULL },
|
||||
{ "X339WEP", "/usr/X11R6", &XF86ServerDists, DIST_XF86_SERVER_9WEP, NULL },
|
||||
{ "X339WS", "/usr/X11R6", &XF86ServerDists, DIST_XF86_SERVER_9WS, NULL },
|
||||
{ "X339WSN", "/usr/X11R6", &XF86ServerDists, DIST_XF86_SERVER_9WSN, NULL },
|
||||
{ "X33AGX", "/usr/X11R6", &XF86ServerDists, DIST_XF86_SERVER_AGX, NULL },
|
||||
{ "X33I128", "/usr/X11R6", &XF86ServerDists, DIST_XF86_SERVER_I128, NULL },
|
||||
{ "X33Ma8", "/usr/X11R6", &XF86ServerDists, DIST_XF86_SERVER_MACH8, NULL },
|
||||
{ "X33Ma32", "/usr/X11R6", &XF86ServerDists, DIST_XF86_SERVER_MACH32,NULL },
|
||||
{ "X33Ma64", "/usr/X11R6", &XF86ServerDists, DIST_XF86_SERVER_MACH64,NULL },
|
||||
{ "X33Mono", "/usr/X11R6", &XF86ServerDists, DIST_XF86_SERVER_MONO, NULL },
|
||||
{ "X33P9K", "/usr/X11R6", &XF86ServerDists, DIST_XF86_SERVER_P9000, NULL },
|
||||
{ "X33S3", "/usr/X11R6", &XF86ServerDists, DIST_XF86_SERVER_S3, NULL },
|
||||
{ "X33S3V", "/usr/X11R6", &XF86ServerDists, DIST_XF86_SERVER_S3V, NULL },
|
||||
{ "X33SVGA", "/usr/X11R6", &XF86ServerDists, DIST_XF86_SERVER_SVGA, NULL },
|
||||
{ "X33VG16", "/usr/X11R6", &XF86ServerDists, DIST_XF86_SERVER_VGA16, NULL },
|
||||
{ "X33W32", "/usr/X11R6", &XF86ServerDists, DIST_XF86_SERVER_W32, NULL },
|
||||
{ "X33nest", "/usr/X11R6", &XF86ServerDists, DIST_XF86_SERVER_NEST, NULL },
|
||||
{ "X33vfb", "/usr/X11R6", &XF86ServerDists, DIST_XF86_SERVER_VFB, NULL },
|
||||
{ NULL },
|
||||
};
|
||||
|
||||
/* The XFree86 font distribution */
|
||||
static Distribution XF86FontDistTable[] = {
|
||||
{ "X32fnts", "/usr/X11R6", &XF86FontDists, DIST_XF86_FONTS_MISC, NULL },
|
||||
{ "X32f100", "/usr/X11R6", &XF86FontDists, DIST_XF86_FONTS_100, NULL },
|
||||
{ "X32fcyr", "/usr/X11R6", &XF86FontDists, DIST_XF86_FONTS_CYR, NULL },
|
||||
{ "X32fscl", "/usr/X11R6", &XF86FontDists, DIST_XF86_FONTS_SCALE, NULL },
|
||||
{ "X32fnon", "/usr/X11R6", &XF86FontDists, DIST_XF86_FONTS_NON, NULL },
|
||||
{ "X32fsrv", "/usr/X11R6", &XF86FontDists, DIST_XF86_FONTS_SERVER, NULL },
|
||||
{ "X33fnts", "/usr/X11R6", &XF86FontDists, DIST_XF86_FONTS_MISC, NULL },
|
||||
{ "X33f100", "/usr/X11R6", &XF86FontDists, DIST_XF86_FONTS_100, NULL },
|
||||
{ "X33fcyr", "/usr/X11R6", &XF86FontDists, DIST_XF86_FONTS_CYR, NULL },
|
||||
{ "X33fscl", "/usr/X11R6", &XF86FontDists, DIST_XF86_FONTS_SCALE, NULL },
|
||||
{ "X33fnon", "/usr/X11R6", &XF86FontDists, DIST_XF86_FONTS_NON, NULL },
|
||||
{ "X33fsrv", "/usr/X11R6", &XF86FontDists, DIST_XF86_FONTS_SERVER, NULL },
|
||||
{ NULL },
|
||||
};
|
||||
#endif /* !USE_XIG_ENVIRONMENT */
|
||||
|
||||
@ -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.135 1997/05/23 18:54:29 jkh Exp $
|
||||
* $Id: menus.c,v 1.136 1997/05/27 16:41:52 jkh Exp $
|
||||
*
|
||||
* Copyright (c) 1995
|
||||
* Jordan Hubbard. All rights reserved.
|
||||
@ -736,7 +736,7 @@ DMenu MenuSubDistributions = {
|
||||
{ "Xaccel", "The XiG AcceleratedX 3.1 distribution",
|
||||
dmenuFlagCheck, dmenuSetFlag, NULL, &Dists, '[', 'X', ']', DIST_XIG_SERVER },
|
||||
#else
|
||||
{ "XFree86", "The XFree86 3.2 distribution",
|
||||
{ "XFree86", "The XFree86 3.3 distribution",
|
||||
x11FlagCheck, distSetXF86 },
|
||||
#endif
|
||||
{ "All", "All sources, binaries and X Window System binaries",
|
||||
@ -823,8 +823,8 @@ DMenu MenuSrcDistributions = {
|
||||
#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"
|
||||
"XFree86 3.3 Distribution",
|
||||
"Please select the components you need from the XFree86 3.3\n"
|
||||
"distribution sets.",
|
||||
"Press F1 to read the XFree86 release notes for FreeBSD",
|
||||
"XF86",
|
||||
@ -839,7 +839,7 @@ DMenu MenuXF86Select = {
|
||||
|
||||
DMenu MenuXF86SelectCore = {
|
||||
DMENU_CHECKLIST_TYPE | DMENU_SELECTION_RETURNS,
|
||||
"XFree86 3.2 base distribution types",
|
||||
"XFree86 3.3 base distribution types",
|
||||
"Please check off the basic XFree86 components you wish to install.\n"
|
||||
"Bin, lib, and set are recommended for a minimum installaion.",
|
||||
"Press F1 to read the XFree86 release notes for FreeBSD",
|
||||
@ -870,9 +870,9 @@ DMenu MenuXF86SelectCore = {
|
||||
{ "set", "XFree86 Setup Utility",
|
||||
dmenuFlagCheck, dmenuSetFlag, NULL, &XF86Dists, '[', 'X', ']', DIST_XF86_SET },
|
||||
#endif
|
||||
{ "sources", "XFree86 3.2 standard sources",
|
||||
{ "sources", "XFree86 3.3 standard sources",
|
||||
dmenuFlagCheck, dmenuSetFlag, NULL, &XF86Dists, '[', 'X', ']', DIST_XF86_SRC },
|
||||
{ "csources", "XFree86 3.2 contrib sources",
|
||||
{ "csources", "XFree86 3.3 contrib sources",
|
||||
dmenuFlagCheck, dmenuSetFlag, NULL, &XF86Dists, '[', 'X', ']', DIST_XF86_CSRC },
|
||||
{ "All", "Select all of the above",
|
||||
NULL, setX11Misc, NULL, NULL, ' ', ' ', ' ' },
|
||||
|
||||
@ -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.130 1997/05/22 21:26:11 jkh Exp $
|
||||
* $Id: sysinstall.h,v 1.131 1997/06/05 09:48:01 jkh Exp $
|
||||
*
|
||||
* Copyright (c) 1995
|
||||
* Jordan Hubbard. All rights reserved.
|
||||
@ -129,6 +129,7 @@
|
||||
#define VAR_MEDIA_TIMEOUT "MEDIA_TIMEOUT"
|
||||
#define VAR_NAMESERVER "nameserver"
|
||||
#define VAR_NETMASK "netmask"
|
||||
#define VAR_NETWORK_DEVICE "netDev"
|
||||
#define VAR_NFS_PATH "nfs"
|
||||
#define VAR_NFS_HOST "nfsHost"
|
||||
#define VAR_NFS_SECURE "nfsSecure"
|
||||
|
||||
@ -1,5 +1,5 @@
|
||||
/*
|
||||
* $Id: tcpip.c,v 1.64 1997/02/22 14:12:23 peter Exp $
|
||||
* $Id: tcpip.c,v 1.65 1997/03/09 22:25:49 jkh Exp $
|
||||
*
|
||||
* Copyright (c) 1995
|
||||
* Gary J Palmer. All rights reserved.
|
||||
@ -149,7 +149,7 @@ verifySettings(void)
|
||||
int
|
||||
tcpOpenDialog(Device *devp)
|
||||
{
|
||||
WINDOW *ds_win, *save;
|
||||
WINDOW *ds_win, *save = NULL;
|
||||
ComposeObj *obj = NULL;
|
||||
int n = 0, cancel = FALSE;
|
||||
int max, ret;
|
||||
@ -160,25 +160,6 @@ tcpOpenDialog(Device *devp)
|
||||
if (!msgYesNo("Running multi-user, assume that the network is already configured?"))
|
||||
return DITEM_SUCCESS;
|
||||
}
|
||||
save = savescr();
|
||||
dialog_clear_norefresh();
|
||||
|
||||
/* We need a curses window */
|
||||
if (!(ds_win = openLayoutDialog(TCP_HELPFILE, " Network Configuration ",
|
||||
TCP_DIALOG_X, TCP_DIALOG_Y, TCP_DIALOG_WIDTH, TCP_DIALOG_HEIGHT))) {
|
||||
beep();
|
||||
msgConfirm("Cannot open TCP/IP dialog window!!");
|
||||
restorescr(save);
|
||||
return DITEM_FAILURE;
|
||||
}
|
||||
|
||||
/* Draw interface configuration box */
|
||||
draw_box(ds_win, TCP_DIALOG_Y + 9, TCP_DIALOG_X + 8, TCP_DIALOG_HEIGHT - 13, TCP_DIALOG_WIDTH - 17,
|
||||
dialog_attr, border_attr);
|
||||
wattrset(ds_win, dialog_attr);
|
||||
sprintf(title, " Configuration for Interface %s ", devp->name);
|
||||
mvwaddstr(ds_win, TCP_DIALOG_Y + 9, TCP_DIALOG_X + 14, title);
|
||||
|
||||
/* Initialise vars from previous device values */
|
||||
if (devp->private) {
|
||||
DevInfo *di = (DevInfo *)devp->private;
|
||||
@ -232,6 +213,30 @@ tcpOpenDialog(Device *devp)
|
||||
else
|
||||
bzero(nameserver, sizeof(nameserver));
|
||||
|
||||
/* If non-interactive, jump straight over the dialog crap and into config section */
|
||||
if (variable_get(VAR_NONINTERACTIVE))
|
||||
goto netconfig;
|
||||
|
||||
/* Now do all the screen I/O */
|
||||
save = savescr();
|
||||
dialog_clear_norefresh();
|
||||
|
||||
/* We need a curses window */
|
||||
if (!(ds_win = openLayoutDialog(TCP_HELPFILE, " Network Configuration ",
|
||||
TCP_DIALOG_X, TCP_DIALOG_Y, TCP_DIALOG_WIDTH, TCP_DIALOG_HEIGHT))) {
|
||||
beep();
|
||||
msgConfirm("Cannot open TCP/IP dialog window!!");
|
||||
restorescr(save);
|
||||
return DITEM_FAILURE;
|
||||
}
|
||||
|
||||
/* Draw interface configuration box */
|
||||
draw_box(ds_win, TCP_DIALOG_Y + 9, TCP_DIALOG_X + 8, TCP_DIALOG_HEIGHT - 13, TCP_DIALOG_WIDTH - 17,
|
||||
dialog_attr, border_attr);
|
||||
wattrset(ds_win, dialog_attr);
|
||||
sprintf(title, " Configuration for Interface %s ", devp->name);
|
||||
mvwaddstr(ds_win, TCP_DIALOG_Y + 9, TCP_DIALOG_X + 14, title);
|
||||
|
||||
/* Some more initialisation before we go into the main input loop */
|
||||
obj = initLayoutDialog(ds_win, layout, TCP_DIALOG_X, TCP_DIALOG_Y, &max);
|
||||
|
||||
@ -268,6 +273,7 @@ reenter:
|
||||
data now if the user hasn't selected cancel. Save the stuff
|
||||
out to the environment via the variable_set() mechanism */
|
||||
|
||||
netconfig:
|
||||
if (!cancel) {
|
||||
DevInfo *di;
|
||||
char temp[512], ifn[255];
|
||||
@ -338,14 +344,21 @@ tcpDeviceSelect(void)
|
||||
|
||||
devs = deviceFind(NULL, DEVICE_TYPE_NETWORK);
|
||||
cnt = deviceCount(devs);
|
||||
if (!cnt) {
|
||||
rval = NULL;
|
||||
|
||||
if (!cnt)
|
||||
msgConfirm("No network devices available!");
|
||||
rval = NULL;
|
||||
}
|
||||
else if (cnt == 1) {
|
||||
if (DITEM_STATUS(tcpOpenDialog(devs[0]) == DITEM_FAILURE))
|
||||
return NULL;
|
||||
rval = devs[0];
|
||||
if (DITEM_STATUS(tcpOpenDialog(devs[0]) == DITEM_SUCCESS))
|
||||
rval = devs[0];
|
||||
}
|
||||
else if (variable_get(VAR_NONINTERACTIVE) && variable_get(VAR_NETWORK_DEVICE)) {
|
||||
devs = deviceFind(variable_get(VAR_NETWORK_DEVICE), DEVICE_TYPE_NETWORK);
|
||||
cnt = deviceCount(devs);
|
||||
if (cnt) {
|
||||
if (DITEM_STATUS(tcpOpenDialog(devs[0]) == DITEM_SUCCESS))
|
||||
rval = devs[0];
|
||||
}
|
||||
}
|
||||
else {
|
||||
int status;
|
||||
@ -355,9 +368,7 @@ tcpDeviceSelect(void)
|
||||
msgFatal("Unable to create network device menu! Argh!");
|
||||
status = dmenuOpenSimple(menu, FALSE);
|
||||
free(menu);
|
||||
if (!status)
|
||||
rval = NULL;
|
||||
else
|
||||
if (status)
|
||||
rval = NetDev;
|
||||
}
|
||||
return rval;
|
||||
|
||||
@ -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.135 1997/05/23 18:54:29 jkh Exp $
|
||||
* $Id: menus.c,v 1.136 1997/05/27 16:41:52 jkh Exp $
|
||||
*
|
||||
* Copyright (c) 1995
|
||||
* Jordan Hubbard. All rights reserved.
|
||||
@ -736,7 +736,7 @@ DMenu MenuSubDistributions = {
|
||||
{ "Xaccel", "The XiG AcceleratedX 3.1 distribution",
|
||||
dmenuFlagCheck, dmenuSetFlag, NULL, &Dists, '[', 'X', ']', DIST_XIG_SERVER },
|
||||
#else
|
||||
{ "XFree86", "The XFree86 3.2 distribution",
|
||||
{ "XFree86", "The XFree86 3.3 distribution",
|
||||
x11FlagCheck, distSetXF86 },
|
||||
#endif
|
||||
{ "All", "All sources, binaries and X Window System binaries",
|
||||
@ -823,8 +823,8 @@ DMenu MenuSrcDistributions = {
|
||||
#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"
|
||||
"XFree86 3.3 Distribution",
|
||||
"Please select the components you need from the XFree86 3.3\n"
|
||||
"distribution sets.",
|
||||
"Press F1 to read the XFree86 release notes for FreeBSD",
|
||||
"XF86",
|
||||
@ -839,7 +839,7 @@ DMenu MenuXF86Select = {
|
||||
|
||||
DMenu MenuXF86SelectCore = {
|
||||
DMENU_CHECKLIST_TYPE | DMENU_SELECTION_RETURNS,
|
||||
"XFree86 3.2 base distribution types",
|
||||
"XFree86 3.3 base distribution types",
|
||||
"Please check off the basic XFree86 components you wish to install.\n"
|
||||
"Bin, lib, and set are recommended for a minimum installaion.",
|
||||
"Press F1 to read the XFree86 release notes for FreeBSD",
|
||||
@ -870,9 +870,9 @@ DMenu MenuXF86SelectCore = {
|
||||
{ "set", "XFree86 Setup Utility",
|
||||
dmenuFlagCheck, dmenuSetFlag, NULL, &XF86Dists, '[', 'X', ']', DIST_XF86_SET },
|
||||
#endif
|
||||
{ "sources", "XFree86 3.2 standard sources",
|
||||
{ "sources", "XFree86 3.3 standard sources",
|
||||
dmenuFlagCheck, dmenuSetFlag, NULL, &XF86Dists, '[', 'X', ']', DIST_XF86_SRC },
|
||||
{ "csources", "XFree86 3.2 contrib sources",
|
||||
{ "csources", "XFree86 3.3 contrib sources",
|
||||
dmenuFlagCheck, dmenuSetFlag, NULL, &XF86Dists, '[', 'X', ']', DIST_XF86_CSRC },
|
||||
{ "All", "Select all of the above",
|
||||
NULL, setX11Misc, NULL, NULL, ' ', ' ', ' ' },
|
||||
|
||||
@ -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.130 1997/05/22 21:26:11 jkh Exp $
|
||||
* $Id: sysinstall.h,v 1.131 1997/06/05 09:48:01 jkh Exp $
|
||||
*
|
||||
* Copyright (c) 1995
|
||||
* Jordan Hubbard. All rights reserved.
|
||||
@ -129,6 +129,7 @@
|
||||
#define VAR_MEDIA_TIMEOUT "MEDIA_TIMEOUT"
|
||||
#define VAR_NAMESERVER "nameserver"
|
||||
#define VAR_NETMASK "netmask"
|
||||
#define VAR_NETWORK_DEVICE "netDev"
|
||||
#define VAR_NFS_PATH "nfs"
|
||||
#define VAR_NFS_HOST "nfsHost"
|
||||
#define VAR_NFS_SECURE "nfsSecure"
|
||||
|
||||
@ -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.107 1997/05/05 05:16:01 pst Exp $
|
||||
* $Id: dist.c,v 1.108 1997/06/05 09:47:56 jkh Exp $
|
||||
*
|
||||
* Copyright (c) 1995
|
||||
* Jordan Hubbard. All rights reserved.
|
||||
@ -83,7 +83,7 @@ static Distribution DistTable[] = {
|
||||
#ifdef USE_XIG_ENVIRONMENT
|
||||
{ "accelx", "/usr/X11R6/lib/X11", &Dists, DIST_XIG_SERVER, NULL },
|
||||
#else
|
||||
{ "XF8632", "/usr", &Dists, DIST_XF86, XF86DistTable },
|
||||
{ "XF8633", "/usr", &Dists, DIST_XF86, XF86DistTable },
|
||||
#endif
|
||||
{ NULL },
|
||||
};
|
||||
@ -122,64 +122,64 @@ static Distribution SrcDistTable[] = {
|
||||
#ifndef USE_XIG_ENVIRONMENT
|
||||
/* The XFree86 distribution */
|
||||
static Distribution XF86DistTable[] = {
|
||||
{ "XF8632", "/usr/X11R6", &XF86Dists, DIST_XF86_FONTS, XF86FontDistTable },
|
||||
{ "XF8632", "/usr/X11R6", &XF86Dists, DIST_XF86_SERVER, XF86ServerDistTable },
|
||||
{ "XF8633", "/usr/X11R6", &XF86Dists, DIST_XF86_FONTS, XF86FontDistTable },
|
||||
{ "XF8633", "/usr/X11R6", &XF86Dists, DIST_XF86_SERVER, XF86ServerDistTable },
|
||||
{ "XF86-xc", "/usr/X11R6/src", &XF86Dists, DIST_XF86_SRC, NULL },
|
||||
{ "XF86-co", "/usr/X11R6/src", &XF86Dists, DIST_XF86_CSRC, NULL },
|
||||
{ "X32bin", "/usr/X11R6", &XF86Dists, DIST_XF86_BIN, NULL },
|
||||
{ "X32cfg", "/usr/X11R6", &XF86Dists, DIST_XF86_CFG, NULL },
|
||||
{ "X32doc", "/usr/X11R6", &XF86Dists, DIST_XF86_DOC, NULL },
|
||||
{ "X32html", "/usr/X11R6", &XF86Dists, DIST_XF86_HTML, NULL },
|
||||
{ "X32lib", "/usr/X11R6", &XF86Dists, DIST_XF86_LIB, NULL },
|
||||
{ "X32lk98", "/usr/X11R6", &XF86Dists, DIST_XF86_LKIT98, NULL },
|
||||
{ "X32lkit", "/usr/X11R6", &XF86Dists, DIST_XF86_LKIT, NULL },
|
||||
{ "X32man", "/usr/X11R6", &XF86Dists, DIST_XF86_MAN, NULL },
|
||||
{ "X32prog", "/usr/X11R6", &XF86Dists, DIST_XF86_PROG, NULL },
|
||||
{ "X32ps", "/usr/X11R6", &XF86Dists, DIST_XF86_PS, NULL },
|
||||
{ "X32set", "/usr/X11R6", &XF86Dists, DIST_XF86_SET, NULL },
|
||||
{ "X33bin", "/usr/X11R6", &XF86Dists, DIST_XF86_BIN, NULL },
|
||||
{ "X33cfg", "/usr/X11R6", &XF86Dists, DIST_XF86_CFG, NULL },
|
||||
{ "X33doc", "/usr/X11R6", &XF86Dists, DIST_XF86_DOC, NULL },
|
||||
{ "X33html", "/usr/X11R6", &XF86Dists, DIST_XF86_HTML, NULL },
|
||||
{ "X33lib", "/usr/X11R6", &XF86Dists, DIST_XF86_LIB, NULL },
|
||||
{ "X33lk98", "/usr/X11R6", &XF86Dists, DIST_XF86_LKIT98, NULL },
|
||||
{ "X33lkit", "/usr/X11R6", &XF86Dists, DIST_XF86_LKIT, NULL },
|
||||
{ "X33man", "/usr/X11R6", &XF86Dists, DIST_XF86_MAN, NULL },
|
||||
{ "X33prog", "/usr/X11R6", &XF86Dists, DIST_XF86_PROG, NULL },
|
||||
{ "X33ps", "/usr/X11R6", &XF86Dists, DIST_XF86_PS, NULL },
|
||||
{ "X33set", "/usr/X11R6", &XF86Dists, DIST_XF86_SET, NULL },
|
||||
{ NULL },
|
||||
};
|
||||
|
||||
/* The XFree86 server distribution */
|
||||
static Distribution XF86ServerDistTable[] = {
|
||||
{ "X328514", "/usr/X11R6", &XF86ServerDists, DIST_XF86_SERVER_8514, NULL },
|
||||
{ "X329480", "/usr/X11R6", &XF86ServerDists, DIST_XF86_SERVER_9480, NULL },
|
||||
{ "X329EGC", "/usr/X11R6", &XF86ServerDists, DIST_XF86_SERVER_9EGC, NULL },
|
||||
{ "X329GA9", "/usr/X11R6", &XF86ServerDists, DIST_XF86_SERVER_9GA9, NULL },
|
||||
{ "X329GAN", "/usr/X11R6", &XF86ServerDists, DIST_XF86_SERVER_9GAN, NULL },
|
||||
{ "X329LPW", "/usr/X11R6", &XF86ServerDists, DIST_XF86_SERVER_9LPW, NULL },
|
||||
{ "X329NKV", "/usr/X11R6", &XF86ServerDists, DIST_XF86_SERVER_9NKV, NULL },
|
||||
{ "X329NS3", "/usr/X11R6", &XF86ServerDists, DIST_XF86_SERVER_9NS3, NULL },
|
||||
{ "X329SPW", "/usr/X11R6", &XF86ServerDists, DIST_XF86_SERVER_9SPW, NULL },
|
||||
{ "X329TGU", "/usr/X11R6", &XF86ServerDists, DIST_XF86_SERVER_9TGU, NULL },
|
||||
{ "X329WEP", "/usr/X11R6", &XF86ServerDists, DIST_XF86_SERVER_9WEP, NULL },
|
||||
{ "X329WS", "/usr/X11R6", &XF86ServerDists, DIST_XF86_SERVER_9WS, NULL },
|
||||
{ "X329WSN", "/usr/X11R6", &XF86ServerDists, DIST_XF86_SERVER_9WSN, NULL },
|
||||
{ "X32AGX", "/usr/X11R6", &XF86ServerDists, DIST_XF86_SERVER_AGX, NULL },
|
||||
{ "X32I128", "/usr/X11R6", &XF86ServerDists, DIST_XF86_SERVER_I128, NULL },
|
||||
{ "X32Ma8", "/usr/X11R6", &XF86ServerDists, DIST_XF86_SERVER_MACH8, NULL },
|
||||
{ "X32Ma32", "/usr/X11R6", &XF86ServerDists, DIST_XF86_SERVER_MACH32,NULL },
|
||||
{ "X32Ma64", "/usr/X11R6", &XF86ServerDists, DIST_XF86_SERVER_MACH64,NULL },
|
||||
{ "X32Mono", "/usr/X11R6", &XF86ServerDists, DIST_XF86_SERVER_MONO, NULL },
|
||||
{ "X32P9K", "/usr/X11R6", &XF86ServerDists, DIST_XF86_SERVER_P9000, NULL },
|
||||
{ "X32S3", "/usr/X11R6", &XF86ServerDists, DIST_XF86_SERVER_S3, NULL },
|
||||
{ "X32S3V", "/usr/X11R6", &XF86ServerDists, DIST_XF86_SERVER_S3V, NULL },
|
||||
{ "X32SVGA", "/usr/X11R6", &XF86ServerDists, DIST_XF86_SERVER_SVGA, NULL },
|
||||
{ "X32VG16", "/usr/X11R6", &XF86ServerDists, DIST_XF86_SERVER_VGA16, NULL },
|
||||
{ "X32W32", "/usr/X11R6", &XF86ServerDists, DIST_XF86_SERVER_W32, NULL },
|
||||
{ "X32nest", "/usr/X11R6", &XF86ServerDists, DIST_XF86_SERVER_NEST, NULL },
|
||||
{ "X32vfb", "/usr/X11R6", &XF86ServerDists, DIST_XF86_SERVER_VFB, NULL },
|
||||
{ "X338514", "/usr/X11R6", &XF86ServerDists, DIST_XF86_SERVER_8514, NULL },
|
||||
{ "X339480", "/usr/X11R6", &XF86ServerDists, DIST_XF86_SERVER_9480, NULL },
|
||||
{ "X339EGC", "/usr/X11R6", &XF86ServerDists, DIST_XF86_SERVER_9EGC, NULL },
|
||||
{ "X339GA9", "/usr/X11R6", &XF86ServerDists, DIST_XF86_SERVER_9GA9, NULL },
|
||||
{ "X339GAN", "/usr/X11R6", &XF86ServerDists, DIST_XF86_SERVER_9GAN, NULL },
|
||||
{ "X339LPW", "/usr/X11R6", &XF86ServerDists, DIST_XF86_SERVER_9LPW, NULL },
|
||||
{ "X339NKV", "/usr/X11R6", &XF86ServerDists, DIST_XF86_SERVER_9NKV, NULL },
|
||||
{ "X339NS3", "/usr/X11R6", &XF86ServerDists, DIST_XF86_SERVER_9NS3, NULL },
|
||||
{ "X339SPW", "/usr/X11R6", &XF86ServerDists, DIST_XF86_SERVER_9SPW, NULL },
|
||||
{ "X339TGU", "/usr/X11R6", &XF86ServerDists, DIST_XF86_SERVER_9TGU, NULL },
|
||||
{ "X339WEP", "/usr/X11R6", &XF86ServerDists, DIST_XF86_SERVER_9WEP, NULL },
|
||||
{ "X339WS", "/usr/X11R6", &XF86ServerDists, DIST_XF86_SERVER_9WS, NULL },
|
||||
{ "X339WSN", "/usr/X11R6", &XF86ServerDists, DIST_XF86_SERVER_9WSN, NULL },
|
||||
{ "X33AGX", "/usr/X11R6", &XF86ServerDists, DIST_XF86_SERVER_AGX, NULL },
|
||||
{ "X33I128", "/usr/X11R6", &XF86ServerDists, DIST_XF86_SERVER_I128, NULL },
|
||||
{ "X33Ma8", "/usr/X11R6", &XF86ServerDists, DIST_XF86_SERVER_MACH8, NULL },
|
||||
{ "X33Ma32", "/usr/X11R6", &XF86ServerDists, DIST_XF86_SERVER_MACH32,NULL },
|
||||
{ "X33Ma64", "/usr/X11R6", &XF86ServerDists, DIST_XF86_SERVER_MACH64,NULL },
|
||||
{ "X33Mono", "/usr/X11R6", &XF86ServerDists, DIST_XF86_SERVER_MONO, NULL },
|
||||
{ "X33P9K", "/usr/X11R6", &XF86ServerDists, DIST_XF86_SERVER_P9000, NULL },
|
||||
{ "X33S3", "/usr/X11R6", &XF86ServerDists, DIST_XF86_SERVER_S3, NULL },
|
||||
{ "X33S3V", "/usr/X11R6", &XF86ServerDists, DIST_XF86_SERVER_S3V, NULL },
|
||||
{ "X33SVGA", "/usr/X11R6", &XF86ServerDists, DIST_XF86_SERVER_SVGA, NULL },
|
||||
{ "X33VG16", "/usr/X11R6", &XF86ServerDists, DIST_XF86_SERVER_VGA16, NULL },
|
||||
{ "X33W32", "/usr/X11R6", &XF86ServerDists, DIST_XF86_SERVER_W32, NULL },
|
||||
{ "X33nest", "/usr/X11R6", &XF86ServerDists, DIST_XF86_SERVER_NEST, NULL },
|
||||
{ "X33vfb", "/usr/X11R6", &XF86ServerDists, DIST_XF86_SERVER_VFB, NULL },
|
||||
{ NULL },
|
||||
};
|
||||
|
||||
/* The XFree86 font distribution */
|
||||
static Distribution XF86FontDistTable[] = {
|
||||
{ "X32fnts", "/usr/X11R6", &XF86FontDists, DIST_XF86_FONTS_MISC, NULL },
|
||||
{ "X32f100", "/usr/X11R6", &XF86FontDists, DIST_XF86_FONTS_100, NULL },
|
||||
{ "X32fcyr", "/usr/X11R6", &XF86FontDists, DIST_XF86_FONTS_CYR, NULL },
|
||||
{ "X32fscl", "/usr/X11R6", &XF86FontDists, DIST_XF86_FONTS_SCALE, NULL },
|
||||
{ "X32fnon", "/usr/X11R6", &XF86FontDists, DIST_XF86_FONTS_NON, NULL },
|
||||
{ "X32fsrv", "/usr/X11R6", &XF86FontDists, DIST_XF86_FONTS_SERVER, NULL },
|
||||
{ "X33fnts", "/usr/X11R6", &XF86FontDists, DIST_XF86_FONTS_MISC, NULL },
|
||||
{ "X33f100", "/usr/X11R6", &XF86FontDists, DIST_XF86_FONTS_100, NULL },
|
||||
{ "X33fcyr", "/usr/X11R6", &XF86FontDists, DIST_XF86_FONTS_CYR, NULL },
|
||||
{ "X33fscl", "/usr/X11R6", &XF86FontDists, DIST_XF86_FONTS_SCALE, NULL },
|
||||
{ "X33fnon", "/usr/X11R6", &XF86FontDists, DIST_XF86_FONTS_NON, NULL },
|
||||
{ "X33fsrv", "/usr/X11R6", &XF86FontDists, DIST_XF86_FONTS_SERVER, NULL },
|
||||
{ NULL },
|
||||
};
|
||||
#endif /* !USE_XIG_ENVIRONMENT */
|
||||
|
||||
@ -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.135 1997/05/23 18:54:29 jkh Exp $
|
||||
* $Id: menus.c,v 1.136 1997/05/27 16:41:52 jkh Exp $
|
||||
*
|
||||
* Copyright (c) 1995
|
||||
* Jordan Hubbard. All rights reserved.
|
||||
@ -736,7 +736,7 @@ DMenu MenuSubDistributions = {
|
||||
{ "Xaccel", "The XiG AcceleratedX 3.1 distribution",
|
||||
dmenuFlagCheck, dmenuSetFlag, NULL, &Dists, '[', 'X', ']', DIST_XIG_SERVER },
|
||||
#else
|
||||
{ "XFree86", "The XFree86 3.2 distribution",
|
||||
{ "XFree86", "The XFree86 3.3 distribution",
|
||||
x11FlagCheck, distSetXF86 },
|
||||
#endif
|
||||
{ "All", "All sources, binaries and X Window System binaries",
|
||||
@ -823,8 +823,8 @@ DMenu MenuSrcDistributions = {
|
||||
#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"
|
||||
"XFree86 3.3 Distribution",
|
||||
"Please select the components you need from the XFree86 3.3\n"
|
||||
"distribution sets.",
|
||||
"Press F1 to read the XFree86 release notes for FreeBSD",
|
||||
"XF86",
|
||||
@ -839,7 +839,7 @@ DMenu MenuXF86Select = {
|
||||
|
||||
DMenu MenuXF86SelectCore = {
|
||||
DMENU_CHECKLIST_TYPE | DMENU_SELECTION_RETURNS,
|
||||
"XFree86 3.2 base distribution types",
|
||||
"XFree86 3.3 base distribution types",
|
||||
"Please check off the basic XFree86 components you wish to install.\n"
|
||||
"Bin, lib, and set are recommended for a minimum installaion.",
|
||||
"Press F1 to read the XFree86 release notes for FreeBSD",
|
||||
@ -870,9 +870,9 @@ DMenu MenuXF86SelectCore = {
|
||||
{ "set", "XFree86 Setup Utility",
|
||||
dmenuFlagCheck, dmenuSetFlag, NULL, &XF86Dists, '[', 'X', ']', DIST_XF86_SET },
|
||||
#endif
|
||||
{ "sources", "XFree86 3.2 standard sources",
|
||||
{ "sources", "XFree86 3.3 standard sources",
|
||||
dmenuFlagCheck, dmenuSetFlag, NULL, &XF86Dists, '[', 'X', ']', DIST_XF86_SRC },
|
||||
{ "csources", "XFree86 3.2 contrib sources",
|
||||
{ "csources", "XFree86 3.3 contrib sources",
|
||||
dmenuFlagCheck, dmenuSetFlag, NULL, &XF86Dists, '[', 'X', ']', DIST_XF86_CSRC },
|
||||
{ "All", "Select all of the above",
|
||||
NULL, setX11Misc, NULL, NULL, ' ', ' ', ' ' },
|
||||
|
||||
@ -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.130 1997/05/22 21:26:11 jkh Exp $
|
||||
* $Id: sysinstall.h,v 1.131 1997/06/05 09:48:01 jkh Exp $
|
||||
*
|
||||
* Copyright (c) 1995
|
||||
* Jordan Hubbard. All rights reserved.
|
||||
@ -129,6 +129,7 @@
|
||||
#define VAR_MEDIA_TIMEOUT "MEDIA_TIMEOUT"
|
||||
#define VAR_NAMESERVER "nameserver"
|
||||
#define VAR_NETMASK "netmask"
|
||||
#define VAR_NETWORK_DEVICE "netDev"
|
||||
#define VAR_NFS_PATH "nfs"
|
||||
#define VAR_NFS_HOST "nfsHost"
|
||||
#define VAR_NFS_SECURE "nfsSecure"
|
||||
|
||||
@ -1,5 +1,5 @@
|
||||
/*
|
||||
* $Id: tcpip.c,v 1.64 1997/02/22 14:12:23 peter Exp $
|
||||
* $Id: tcpip.c,v 1.65 1997/03/09 22:25:49 jkh Exp $
|
||||
*
|
||||
* Copyright (c) 1995
|
||||
* Gary J Palmer. All rights reserved.
|
||||
@ -149,7 +149,7 @@ verifySettings(void)
|
||||
int
|
||||
tcpOpenDialog(Device *devp)
|
||||
{
|
||||
WINDOW *ds_win, *save;
|
||||
WINDOW *ds_win, *save = NULL;
|
||||
ComposeObj *obj = NULL;
|
||||
int n = 0, cancel = FALSE;
|
||||
int max, ret;
|
||||
@ -160,25 +160,6 @@ tcpOpenDialog(Device *devp)
|
||||
if (!msgYesNo("Running multi-user, assume that the network is already configured?"))
|
||||
return DITEM_SUCCESS;
|
||||
}
|
||||
save = savescr();
|
||||
dialog_clear_norefresh();
|
||||
|
||||
/* We need a curses window */
|
||||
if (!(ds_win = openLayoutDialog(TCP_HELPFILE, " Network Configuration ",
|
||||
TCP_DIALOG_X, TCP_DIALOG_Y, TCP_DIALOG_WIDTH, TCP_DIALOG_HEIGHT))) {
|
||||
beep();
|
||||
msgConfirm("Cannot open TCP/IP dialog window!!");
|
||||
restorescr(save);
|
||||
return DITEM_FAILURE;
|
||||
}
|
||||
|
||||
/* Draw interface configuration box */
|
||||
draw_box(ds_win, TCP_DIALOG_Y + 9, TCP_DIALOG_X + 8, TCP_DIALOG_HEIGHT - 13, TCP_DIALOG_WIDTH - 17,
|
||||
dialog_attr, border_attr);
|
||||
wattrset(ds_win, dialog_attr);
|
||||
sprintf(title, " Configuration for Interface %s ", devp->name);
|
||||
mvwaddstr(ds_win, TCP_DIALOG_Y + 9, TCP_DIALOG_X + 14, title);
|
||||
|
||||
/* Initialise vars from previous device values */
|
||||
if (devp->private) {
|
||||
DevInfo *di = (DevInfo *)devp->private;
|
||||
@ -232,6 +213,30 @@ tcpOpenDialog(Device *devp)
|
||||
else
|
||||
bzero(nameserver, sizeof(nameserver));
|
||||
|
||||
/* If non-interactive, jump straight over the dialog crap and into config section */
|
||||
if (variable_get(VAR_NONINTERACTIVE))
|
||||
goto netconfig;
|
||||
|
||||
/* Now do all the screen I/O */
|
||||
save = savescr();
|
||||
dialog_clear_norefresh();
|
||||
|
||||
/* We need a curses window */
|
||||
if (!(ds_win = openLayoutDialog(TCP_HELPFILE, " Network Configuration ",
|
||||
TCP_DIALOG_X, TCP_DIALOG_Y, TCP_DIALOG_WIDTH, TCP_DIALOG_HEIGHT))) {
|
||||
beep();
|
||||
msgConfirm("Cannot open TCP/IP dialog window!!");
|
||||
restorescr(save);
|
||||
return DITEM_FAILURE;
|
||||
}
|
||||
|
||||
/* Draw interface configuration box */
|
||||
draw_box(ds_win, TCP_DIALOG_Y + 9, TCP_DIALOG_X + 8, TCP_DIALOG_HEIGHT - 13, TCP_DIALOG_WIDTH - 17,
|
||||
dialog_attr, border_attr);
|
||||
wattrset(ds_win, dialog_attr);
|
||||
sprintf(title, " Configuration for Interface %s ", devp->name);
|
||||
mvwaddstr(ds_win, TCP_DIALOG_Y + 9, TCP_DIALOG_X + 14, title);
|
||||
|
||||
/* Some more initialisation before we go into the main input loop */
|
||||
obj = initLayoutDialog(ds_win, layout, TCP_DIALOG_X, TCP_DIALOG_Y, &max);
|
||||
|
||||
@ -268,6 +273,7 @@ reenter:
|
||||
data now if the user hasn't selected cancel. Save the stuff
|
||||
out to the environment via the variable_set() mechanism */
|
||||
|
||||
netconfig:
|
||||
if (!cancel) {
|
||||
DevInfo *di;
|
||||
char temp[512], ifn[255];
|
||||
@ -338,14 +344,21 @@ tcpDeviceSelect(void)
|
||||
|
||||
devs = deviceFind(NULL, DEVICE_TYPE_NETWORK);
|
||||
cnt = deviceCount(devs);
|
||||
if (!cnt) {
|
||||
rval = NULL;
|
||||
|
||||
if (!cnt)
|
||||
msgConfirm("No network devices available!");
|
||||
rval = NULL;
|
||||
}
|
||||
else if (cnt == 1) {
|
||||
if (DITEM_STATUS(tcpOpenDialog(devs[0]) == DITEM_FAILURE))
|
||||
return NULL;
|
||||
rval = devs[0];
|
||||
if (DITEM_STATUS(tcpOpenDialog(devs[0]) == DITEM_SUCCESS))
|
||||
rval = devs[0];
|
||||
}
|
||||
else if (variable_get(VAR_NONINTERACTIVE) && variable_get(VAR_NETWORK_DEVICE)) {
|
||||
devs = deviceFind(variable_get(VAR_NETWORK_DEVICE), DEVICE_TYPE_NETWORK);
|
||||
cnt = deviceCount(devs);
|
||||
if (cnt) {
|
||||
if (DITEM_STATUS(tcpOpenDialog(devs[0]) == DITEM_SUCCESS))
|
||||
rval = devs[0];
|
||||
}
|
||||
}
|
||||
else {
|
||||
int status;
|
||||
@ -355,9 +368,7 @@ tcpDeviceSelect(void)
|
||||
msgFatal("Unable to create network device menu! Argh!");
|
||||
status = dmenuOpenSimple(menu, FALSE);
|
||||
free(menu);
|
||||
if (!status)
|
||||
rval = NULL;
|
||||
else
|
||||
if (status)
|
||||
rval = NetDev;
|
||||
}
|
||||
return rval;
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user