mirror of
https://github.com/freebsd/freebsd-src.git
synced 2024-11-30 23:52:49 +00:00
MF22: various fixes for new XFree86 dist and cdrom warnings.
This commit is contained in:
Jordan K. Hubbard
parent
056103b6d3
commit
9c5697dd4f
Notes:
svn2git
2020-12-20 02:59:44 +00:00
svn path=/head/; revision=37797
@ -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.39 1997/04/03 13:44:56 jkh Exp $
|
||||
* $Id: cdrom.c,v 1.40 1998/01/16 15:07:54 jkh Exp $
|
||||
*
|
||||
* Copyright (c) 1995
|
||||
* Jordan Hubbard. All rights reserved.
|
||||
@ -59,9 +59,9 @@ mediaInitCDROM(Device *dev)
|
||||
{
|
||||
struct iso_args args;
|
||||
Attribs *cd_attr;
|
||||
char *cp;
|
||||
char *cp, *mountpoint = "/dist";
|
||||
Boolean readInfo = TRUE;
|
||||
char *mountpoint = "/dist";
|
||||
static Boolean bogusCDOK = FALSE;
|
||||
|
||||
if (cdromMounted)
|
||||
return TRUE;
|
||||
@ -87,27 +87,30 @@ mediaInitCDROM(Device *dev)
|
||||
cdromMounted = TRUE;
|
||||
}
|
||||
|
||||
if (!file_readable(string_concat(mountpoint, "/cdrom.inf"))) {
|
||||
if (!file_readable(string_concat(mountpoint, "/cdrom.inf")) && !bogusCDOK) {
|
||||
if (msgYesNo("Warning: The CD currently in the drive is either not a FreeBSD\n"
|
||||
"CD or it is an older (pre 2.1.5) FreeBSD CD which does not\n"
|
||||
"have a version number on it. Do you wish to use this CD anyway?") != 0) {
|
||||
unmount(mountpoint, MNT_FORCE);
|
||||
return FALSE;
|
||||
}
|
||||
else
|
||||
else {
|
||||
readInfo = FALSE;
|
||||
bogusCDOK = TRUE;
|
||||
}
|
||||
}
|
||||
|
||||
if (readInfo &&
|
||||
(DITEM_STATUS(attr_parse_file(cd_attr, string_concat(mountpoint, "/cdrom.inf"))) == DITEM_FAILURE ||
|
||||
!(cp = attr_match(cd_attr, "CD_VERSION")) || (strcmp(cp, variable_get(VAR_RELNAME)) && strcmp("none", variable_get(VAR_RELNAME))))) {
|
||||
if (!cp)
|
||||
if (!cp) {
|
||||
msgConfirm("Unable to find a %s/cdrom.inf file.\n"
|
||||
"Either this is not a FreeBSD CDROM, there is a problem with\n"
|
||||
"the CDROM driver or something is wrong with your hardware.\n"
|
||||
"Please fix this problem (check the console logs on VTY2) and\n"
|
||||
"try again.", mountpoint);
|
||||
else
|
||||
}
|
||||
else if (!bogusCDOK) {
|
||||
msgConfirm("Warning: The version of the FreeBSD CD currently in the drive\n"
|
||||
"(%s) does not match the version of the boot floppy\n"
|
||||
"(%s).\n\n"
|
||||
@ -116,10 +119,13 @@ mediaInitCDROM(Device *dev)
|
||||
"string to match that of the CD before selecting it as your\n"
|
||||
"installation media.", cp, variable_get(VAR_RELNAME));
|
||||
|
||||
if (msgYesNo("Would you like to try and use this CDROM anyway?") != 0) {
|
||||
unmount(mountpoint, MNT_FORCE);
|
||||
cdromMounted = FALSE;
|
||||
return FALSE;
|
||||
if (msgYesNo("Would you like to try and use this CDROM anyway?") != 0) {
|
||||
unmount(mountpoint, MNT_FORCE);
|
||||
cdromMounted = FALSE;
|
||||
return FALSE;
|
||||
}
|
||||
else
|
||||
bogusCDOK = TRUE;
|
||||
}
|
||||
}
|
||||
msgDebug("Mounted FreeBSD CDROM from device %s\n", dev->devname);
|
||||
|
||||
@ -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.123 1998/03/10 02:37:25 jkh Exp $
|
||||
* $Id: dist.c,v 1.124 1998/06/10 01:15:46 jkh Exp $
|
||||
*
|
||||
* Copyright (c) 1995
|
||||
* Jordan Hubbard. All rights reserved.
|
||||
@ -261,7 +261,7 @@ distSetXDeveloper(dialogMenuItem *self)
|
||||
int i;
|
||||
|
||||
distReset(NULL);
|
||||
Dists = _DIST_DEVELOPER;
|
||||
Dists = _DIST_DEVELOPER | DIST_XF86;
|
||||
SrcDists = DIST_SRC_ALL;
|
||||
XF86Dists = DIST_XF86_BIN | DIST_XF86_SET | DIST_XF86_CFG | DIST_XF86_LIB | DIST_XF86_PROG | DIST_XF86_MAN | DIST_XF86_SERVER | DIST_XF86_FONTS;
|
||||
XF86ServerDists = DIST_XF86_SERVER_SVGA | DIST_XF86_SERVER_VGA16;
|
||||
@ -302,7 +302,7 @@ distSetXUser(dialogMenuItem *self)
|
||||
int i;
|
||||
|
||||
distReset(NULL);
|
||||
Dists = _DIST_USER;
|
||||
Dists = _DIST_USER | DIST_XF86;
|
||||
XF86ServerDists = DIST_XF86_SERVER_SVGA | DIST_XF86_SERVER_VGA16;
|
||||
XF86Dists = DIST_XF86_BIN | DIST_XF86_SET | DIST_XF86_CFG | DIST_XF86_LIB | DIST_XF86_MAN | DIST_XF86_SERVER | DIST_XF86_FONTS;
|
||||
XF86FontDists = DIST_XF86_FONTS_MISC;
|
||||
|
||||
@ -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.166 1998/05/24 20:01:29 jkh Exp $
|
||||
* $Id: menus.c,v 1.167 1998/07/20 10:48:11 yokota Exp $
|
||||
*
|
||||
* Copyright (c) 1995
|
||||
* Jordan Hubbard. All rights reserved.
|
||||
@ -122,52 +122,57 @@ clearX11Fonts(dialogMenuItem *self)
|
||||
return DITEM_SUCCESS | DITEM_REDRAW;
|
||||
}
|
||||
|
||||
#define IS_DEVELOPER(dist, extra) ((((dist) & (_DIST_DEVELOPER | (extra))) == (_DIST_DEVELOPER | (extra))) || \
|
||||
(((dist) & (_DIST_DEVELOPER | DIST_DES | (extra))) == (_DIST_DEVELOPER | DIST_DES | (extra))))
|
||||
#define IS_USER(dist, extra) ((((dist) & (_DIST_USER | (extra))) == (_DIST_USER | (extra))) || \
|
||||
(((dist) & (_DIST_USER | DIST_DES | (extra))) == (_DIST_USER | DIST_DES | (extra))))
|
||||
#define _IS_SET(dist, set) (((dist) & (set)) == (set))
|
||||
|
||||
#define IS_DEVELOPER(dist, extra) (_IS_SET(dist, _DIST_DEVELOPER | extra) || \
|
||||
_IS_SET(dist, _DIST_DEVELOPER | DIST_DES | extra))
|
||||
|
||||
#define IS_USER(dist, extra) (_IS_SET(dist, _DIST_USER | extra) || \
|
||||
_IS_SET(dist, _DIST_USER | DIST_DES | extra))
|
||||
|
||||
static int
|
||||
checkDistDeveloper(dialogMenuItem *self)
|
||||
{
|
||||
return (IS_DEVELOPER(Dists, 0) && SrcDists == DIST_SRC_ALL);
|
||||
return IS_DEVELOPER(Dists, 0) && _IS_SET(SrcDists, DIST_SRC_ALL);
|
||||
}
|
||||
|
||||
static int
|
||||
checkDistXDeveloper(dialogMenuItem *self)
|
||||
{
|
||||
return (IS_DEVELOPER(Dists, DIST_XF86) && SrcDists == DIST_SRC_ALL);
|
||||
return IS_DEVELOPER(Dists, DIST_XF86) && _IS_SET(SrcDists, DIST_SRC_ALL);
|
||||
}
|
||||
|
||||
static int
|
||||
checkDistKernDeveloper(dialogMenuItem *self)
|
||||
{
|
||||
return (IS_DEVELOPER(Dists, 0) && SrcDists == DIST_SRC_SYS);
|
||||
return IS_DEVELOPER(Dists, 0) && _IS_SET(SrcDists, DIST_SRC_SYS);
|
||||
}
|
||||
|
||||
static int
|
||||
checkDistUser(dialogMenuItem *self)
|
||||
{
|
||||
return (IS_USER(Dists, 0));
|
||||
return IS_USER(Dists, 0);
|
||||
}
|
||||
|
||||
static int
|
||||
checkDistXUser(dialogMenuItem *self)
|
||||
{
|
||||
return (IS_USER(Dists, DIST_XF86));
|
||||
return IS_USER(Dists, DIST_XF86);
|
||||
}
|
||||
|
||||
static int
|
||||
checkDistMinimum(dialogMenuItem *self)
|
||||
{
|
||||
return (Dists == DIST_BIN);
|
||||
return Dists == DIST_BIN;
|
||||
}
|
||||
|
||||
static int
|
||||
checkDistEverything(dialogMenuItem *self)
|
||||
{
|
||||
return (Dists == DIST_ALL && SrcDists == DIST_SRC_ALL && XF86Dists == DIST_XF86_ALL &&
|
||||
XF86ServerDists == DIST_XF86_SERVER_ALL && XF86FontDists == DIST_XF86_FONTS_ALL);
|
||||
return Dists == DIST_ALL && _IS_SET(SrcDists, DIST_SRC_ALL) && \
|
||||
_IS_SET(XF86Dists, DIST_XF86_ALL) && \
|
||||
_IS_SET(XF86ServerDists, DIST_XF86_SERVER_ALL) && \
|
||||
_IS_SET(XF86FontDists, DIST_XF86_FONTS_ALL);
|
||||
}
|
||||
|
||||
static int
|
||||
@ -185,7 +190,7 @@ srcFlagCheck(dialogMenuItem *item)
|
||||
static int
|
||||
x11FlagCheck(dialogMenuItem *item)
|
||||
{
|
||||
return XF86Dists;
|
||||
return Dists & DIST_XF86;
|
||||
}
|
||||
|
||||
static int
|
||||
@ -754,7 +759,7 @@ DMenu MenuSubDistributions = {
|
||||
srcFlagCheck, distSetSrc },
|
||||
{ "ports", "The FreeBSD Ports collection",
|
||||
dmenuFlagCheck, dmenuSetFlag, NULL, &Dists, '[', 'X', ']', DIST_PORTS },
|
||||
{ "XFree86", "The XFree86 3.3.2 distribution",
|
||||
{ "XFree86", "The XFree86 3.3.2.3 distribution",
|
||||
x11FlagCheck, distSetXF86 },
|
||||
{ "All", "All sources, binaries and X Window System binaries",
|
||||
NULL, distSetEverything, NULL, NULL, ' ', ' ', ' ' },
|
||||
@ -841,8 +846,8 @@ DMenu MenuSrcDistributions = {
|
||||
|
||||
DMenu MenuXF86Select = {
|
||||
DMENU_NORMAL_TYPE,
|
||||
"XFree86 3.3.2 Distribution",
|
||||
"Please select the components you need from the XFree86 3.3.2\n"
|
||||
"XFree86 3.3.2.3 Distribution",
|
||||
"Please select the components you need from the XFree86 3.3.2.3\n"
|
||||
"distribution sets.",
|
||||
"Press F1 to read the XFree86 release notes for FreeBSD",
|
||||
"XF86",
|
||||
@ -857,7 +862,7 @@ DMenu MenuXF86Select = {
|
||||
|
||||
DMenu MenuXF86SelectCore = {
|
||||
DMENU_CHECKLIST_TYPE | DMENU_SELECTION_RETURNS,
|
||||
"XFree86 3.3.2 base distribution types",
|
||||
"XFree86 3.3.2.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",
|
||||
@ -884,9 +889,9 @@ DMenu MenuXF86SelectCore = {
|
||||
dmenuFlagCheck, dmenuSetFlag, NULL, &XF86Dists, '[', 'X', ']', DIST_XF86_SET },
|
||||
{ "9set", "XFree86 Setup Utility for PC98 machines",
|
||||
dmenuFlagCheck, dmenuSetFlag, NULL, &XF86Dists, '[', 'X', ']', DIST_XF86_9SET },
|
||||
{ "sources", "XFree86 3.3.2 standard sources",
|
||||
{ "sources", "XFree86 3.3.2.3 standard sources",
|
||||
dmenuFlagCheck, dmenuSetFlag, NULL, &XF86Dists, '[', 'X', ']', DIST_XF86_SRC },
|
||||
{ "csources", "XFree86 3.3.2 contrib sources",
|
||||
{ "csources", "XFree86 3.3.2.3 contrib sources",
|
||||
dmenuFlagCheck, dmenuSetFlag, NULL, &XF86Dists, '[', 'X', ']', DIST_XF86_CSRC },
|
||||
{ "All", "Select all of the above",
|
||||
NULL, setX11Misc, NULL, NULL, ' ', ' ', ' ' },
|
||||
|
||||
@ -22,7 +22,7 @@
|
||||
.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
|
||||
.\" SUCH DAMAGE.
|
||||
.\"
|
||||
.\" $Id: sysinstall.8,v 1.8 1998/05/06 12:01:20 jkh Exp $
|
||||
.\" $Id: sysinstall.8,v 1.9 1998/05/24 20:01:31 jkh Exp $
|
||||
.\"
|
||||
.Dd August 9, 1997
|
||||
.Dt SYSINSTALL 8
|
||||
@ -417,93 +417,93 @@ XFree86 official sources.
|
||||
.It Li XF86-co
|
||||
XFree86 contributed sources.
|
||||
.It Li X332bin
|
||||
XFree86 3.3.2 binaries.
|
||||
XFree86 3.3.2.3 binaries.
|
||||
.It Li X332cfg
|
||||
XFree86 3.3.2 configuration files.
|
||||
XFree86 3.3.2.3 configuration files.
|
||||
.It Li X332doc
|
||||
XFree86 3.3.2 documentation.
|
||||
XFree86 3.3.2.3 documentation.
|
||||
.It Li X332html
|
||||
XFree86 3.3.2 HTML documentation.
|
||||
XFree86 3.3.2.3 HTML documentation.
|
||||
.It Li X332lib
|
||||
XFree86 3.3.2 libraries.
|
||||
XFree86 3.3.2.3 libraries.
|
||||
.It Li X332lk98
|
||||
XFree86 3.3.2 server link-kit for PC98 machines.
|
||||
XFree86 3.3.2.3 server link-kit for PC98 machines.
|
||||
.It Li X332lkit
|
||||
XFree86 3.3.2 server link-kit for standard machines.
|
||||
XFree86 3.3.2.3 server link-kit for standard machines.
|
||||
.It Li X332man
|
||||
XFree86 3.3.2 manual pages.
|
||||
XFree86 3.3.2.3 manual pages.
|
||||
.It Li X332prog
|
||||
XFree86 3.3.2 programmer's distribution.
|
||||
XFree86 3.3.2.3 programmer's distribution.
|
||||
.It Li X332ps
|
||||
XFree86 3.3.2 postscript documentation.
|
||||
XFree86 3.3.2.3 postscript documentation.
|
||||
.It Li X332set
|
||||
XFree86 3.3.2 graphical setup tool.
|
||||
XFree86 3.3.2.3 graphical setup tool.
|
||||
.It Li X3328514
|
||||
XFree86 3.3.2 8514 server.
|
||||
XFree86 3.3.2.3 8514 server.
|
||||
.It Li X3329480
|
||||
XFree86 3.3.2 PC98 8-bit (256 color) PEGC-480 server.
|
||||
XFree86 3.3.2.3 PC98 8-bit (256 color) PEGC-480 server.
|
||||
.It Li X3329EGC
|
||||
XFree86 3.3.2 PC98 4-bit (16 color) EGC server.
|
||||
XFree86 3.3.2.3 PC98 4-bit (16 color) EGC server.
|
||||
.It Li X3329GA9
|
||||
XFree86 3.3.2 PC98 GA-968V4/PCI (S3 968) server.
|
||||
XFree86 3.3.2.3 PC98 GA-968V4/PCI (S3 968) server.
|
||||
.It Li X3329GAN
|
||||
XFree86 3.3.2 PC98 GANB-WAP (cirrus) server.
|
||||
XFree86 3.3.2.3 PC98 GANB-WAP (cirrus) server.
|
||||
.It Li X3329LPW
|
||||
XFree86 3.3.2 PC98 PowerWindowLB (S3) server.
|
||||
XFree86 3.3.2.3 PC98 PowerWindowLB (S3) server.
|
||||
.It Li X3329NKV
|
||||
XFree86 3.3.2 PC98 NKV-NEC (cirrus) server.
|
||||
XFree86 3.3.2.3 PC98 NKV-NEC (cirrus) server.
|
||||
.It Li X3329NS3
|
||||
XFree86 3.3.2 PC98 NEC (S3) server.
|
||||
XFree86 3.3.2.3 PC98 NEC (S3) server.
|
||||
.It Li X3329SPW
|
||||
XFree86 3.3.2 PC98 SKB-PowerWindow (S3) server.
|
||||
XFree86 3.3.2.3 PC98 SKB-PowerWindow (S3) server.
|
||||
.It Li X3329TGU
|
||||
XFree86 3.3.2 PC98 Cyber9320 and TGUI9680 server.
|
||||
XFree86 3.3.2.3 PC98 Cyber9320 and TGUI9680 server.
|
||||
.It Li X3329WEP
|
||||
XFree86 3.3.2 PC98 WAB-EP (cirrus) server.
|
||||
XFree86 3.3.2.3 PC98 WAB-EP (cirrus) server.
|
||||
.It Li X3329WS
|
||||
XFree86 3.3.2 PC98 WABS (cirrus) server.
|
||||
XFree86 3.3.2.3 PC98 WABS (cirrus) server.
|
||||
.It Li X3329WSN
|
||||
XFree86 3.3.2 PC98 WSN-A2F (cirrus) server.
|
||||
XFree86 3.3.2.3 PC98 WSN-A2F (cirrus) server.
|
||||
.It Li X332AGX
|
||||
XFree86 3.3.2 8 bit AGX server.
|
||||
XFree86 3.3.2.3 8 bit AGX server.
|
||||
.It Li X332I128
|
||||
XFree86 3.3.2 #9 Imagine I128 server.
|
||||
XFree86 3.3.2.3 #9 Imagine I128 server.
|
||||
.It Li X332Ma8
|
||||
XFree86 3.3.2 ATI Mach8 server.
|
||||
XFree86 3.3.2.3 ATI Mach8 server.
|
||||
.It Li X332Ma32
|
||||
XFree86 3.3.2 ATI Mach32 server.
|
||||
XFree86 3.3.2.3 ATI Mach32 server.
|
||||
.It Li X332Ma64
|
||||
XFree86 3.3.2 ATI Mach64 server.
|
||||
XFree86 3.3.2.3 ATI Mach64 server.
|
||||
.It Li X332Mono
|
||||
XFree86 3.3.2 monochrome server.
|
||||
XFree86 3.3.2.3 monochrome server.
|
||||
.It Li X332P9K
|
||||
XFree86 3.3.2 P9000 server.
|
||||
XFree86 3.3.2.3 P9000 server.
|
||||
.It Li X332S3
|
||||
XFree86 3.3.2 S3 server.
|
||||
XFree86 3.3.2.3 S3 server.
|
||||
.It Li X332S3V
|
||||
XFree86 3.3.2 S3 Virge server.
|
||||
XFree86 3.3.2.3 S3 Virge server.
|
||||
.It Li X332SVGA
|
||||
XFree86 3.3.2 SVGA server.
|
||||
XFree86 3.3.2.3 SVGA server.
|
||||
.It Li X332VG16
|
||||
XFree86 3.3.2 VGA16 server.
|
||||
XFree86 3.3.2.3 VGA16 server.
|
||||
.It Li X332W32
|
||||
XFree86 3.3.2 ET4000/W32, /W32i and /W32p server.
|
||||
XFree86 3.3.2.3 ET4000/W32, /W32i and /W32p server.
|
||||
.It Li X332nest
|
||||
XFree86 3.3.2 nested X server.
|
||||
XFree86 3.3.2.3 nested X server.
|
||||
.It Li X332vfb
|
||||
XFree86 3.3.2 virtual frame-buffer X server.
|
||||
XFree86 3.3.2.3 virtual frame-buffer X server.
|
||||
.It Li X332fnts
|
||||
XFree86 3.3.2 base font set.
|
||||
XFree86 3.3.2.3 base font set.
|
||||
.It Li X332f100
|
||||
XFree86 3.3.2 100DPI font set.
|
||||
XFree86 3.3.2.3 100DPI font set.
|
||||
.It Li X332fcyr
|
||||
XFree86 3.3.2 Cyrillic font set.
|
||||
XFree86 3.3.2.3 Cyrillic font set.
|
||||
.It Li X332fscl
|
||||
XFree86 3.3.2 scalable font set.
|
||||
XFree86 3.3.2.3 scalable font set.
|
||||
.It Li X332fnon
|
||||
XFree86 3.3.2 non-english font set.
|
||||
XFree86 3.3.2.3 non-english font set.
|
||||
.It Li X332fsrv
|
||||
XFree86 3.3.2 font server.
|
||||
XFree86 3.3.2.3 font server.
|
||||
.El
|
||||
.It distSetDeveloper
|
||||
Selects the standard Developer's distribution set.
|
||||
@ -542,7 +542,7 @@ Interactively select source subcomponents.
|
||||
.Pp
|
||||
\fBVariables:\fR None
|
||||
.It distSetXF86
|
||||
Interactively select XFree86 3.3.2 subcomponents.
|
||||
Interactively select XFree86 3.3.2.3 subcomponents.
|
||||
.Pp
|
||||
\fBVariables:\fR None
|
||||
.It distExtractAll
|
||||
|
||||
@ -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.166 1998/05/24 20:01:29 jkh Exp $
|
||||
* $Id: menus.c,v 1.167 1998/07/20 10:48:11 yokota Exp $
|
||||
*
|
||||
* Copyright (c) 1995
|
||||
* Jordan Hubbard. All rights reserved.
|
||||
@ -122,52 +122,57 @@ clearX11Fonts(dialogMenuItem *self)
|
||||
return DITEM_SUCCESS | DITEM_REDRAW;
|
||||
}
|
||||
|
||||
#define IS_DEVELOPER(dist, extra) ((((dist) & (_DIST_DEVELOPER | (extra))) == (_DIST_DEVELOPER | (extra))) || \
|
||||
(((dist) & (_DIST_DEVELOPER | DIST_DES | (extra))) == (_DIST_DEVELOPER | DIST_DES | (extra))))
|
||||
#define IS_USER(dist, extra) ((((dist) & (_DIST_USER | (extra))) == (_DIST_USER | (extra))) || \
|
||||
(((dist) & (_DIST_USER | DIST_DES | (extra))) == (_DIST_USER | DIST_DES | (extra))))
|
||||
#define _IS_SET(dist, set) (((dist) & (set)) == (set))
|
||||
|
||||
#define IS_DEVELOPER(dist, extra) (_IS_SET(dist, _DIST_DEVELOPER | extra) || \
|
||||
_IS_SET(dist, _DIST_DEVELOPER | DIST_DES | extra))
|
||||
|
||||
#define IS_USER(dist, extra) (_IS_SET(dist, _DIST_USER | extra) || \
|
||||
_IS_SET(dist, _DIST_USER | DIST_DES | extra))
|
||||
|
||||
static int
|
||||
checkDistDeveloper(dialogMenuItem *self)
|
||||
{
|
||||
return (IS_DEVELOPER(Dists, 0) && SrcDists == DIST_SRC_ALL);
|
||||
return IS_DEVELOPER(Dists, 0) && _IS_SET(SrcDists, DIST_SRC_ALL);
|
||||
}
|
||||
|
||||
static int
|
||||
checkDistXDeveloper(dialogMenuItem *self)
|
||||
{
|
||||
return (IS_DEVELOPER(Dists, DIST_XF86) && SrcDists == DIST_SRC_ALL);
|
||||
return IS_DEVELOPER(Dists, DIST_XF86) && _IS_SET(SrcDists, DIST_SRC_ALL);
|
||||
}
|
||||
|
||||
static int
|
||||
checkDistKernDeveloper(dialogMenuItem *self)
|
||||
{
|
||||
return (IS_DEVELOPER(Dists, 0) && SrcDists == DIST_SRC_SYS);
|
||||
return IS_DEVELOPER(Dists, 0) && _IS_SET(SrcDists, DIST_SRC_SYS);
|
||||
}
|
||||
|
||||
static int
|
||||
checkDistUser(dialogMenuItem *self)
|
||||
{
|
||||
return (IS_USER(Dists, 0));
|
||||
return IS_USER(Dists, 0);
|
||||
}
|
||||
|
||||
static int
|
||||
checkDistXUser(dialogMenuItem *self)
|
||||
{
|
||||
return (IS_USER(Dists, DIST_XF86));
|
||||
return IS_USER(Dists, DIST_XF86);
|
||||
}
|
||||
|
||||
static int
|
||||
checkDistMinimum(dialogMenuItem *self)
|
||||
{
|
||||
return (Dists == DIST_BIN);
|
||||
return Dists == DIST_BIN;
|
||||
}
|
||||
|
||||
static int
|
||||
checkDistEverything(dialogMenuItem *self)
|
||||
{
|
||||
return (Dists == DIST_ALL && SrcDists == DIST_SRC_ALL && XF86Dists == DIST_XF86_ALL &&
|
||||
XF86ServerDists == DIST_XF86_SERVER_ALL && XF86FontDists == DIST_XF86_FONTS_ALL);
|
||||
return Dists == DIST_ALL && _IS_SET(SrcDists, DIST_SRC_ALL) && \
|
||||
_IS_SET(XF86Dists, DIST_XF86_ALL) && \
|
||||
_IS_SET(XF86ServerDists, DIST_XF86_SERVER_ALL) && \
|
||||
_IS_SET(XF86FontDists, DIST_XF86_FONTS_ALL);
|
||||
}
|
||||
|
||||
static int
|
||||
@ -185,7 +190,7 @@ srcFlagCheck(dialogMenuItem *item)
|
||||
static int
|
||||
x11FlagCheck(dialogMenuItem *item)
|
||||
{
|
||||
return XF86Dists;
|
||||
return Dists & DIST_XF86;
|
||||
}
|
||||
|
||||
static int
|
||||
@ -754,7 +759,7 @@ DMenu MenuSubDistributions = {
|
||||
srcFlagCheck, distSetSrc },
|
||||
{ "ports", "The FreeBSD Ports collection",
|
||||
dmenuFlagCheck, dmenuSetFlag, NULL, &Dists, '[', 'X', ']', DIST_PORTS },
|
||||
{ "XFree86", "The XFree86 3.3.2 distribution",
|
||||
{ "XFree86", "The XFree86 3.3.2.3 distribution",
|
||||
x11FlagCheck, distSetXF86 },
|
||||
{ "All", "All sources, binaries and X Window System binaries",
|
||||
NULL, distSetEverything, NULL, NULL, ' ', ' ', ' ' },
|
||||
@ -841,8 +846,8 @@ DMenu MenuSrcDistributions = {
|
||||
|
||||
DMenu MenuXF86Select = {
|
||||
DMENU_NORMAL_TYPE,
|
||||
"XFree86 3.3.2 Distribution",
|
||||
"Please select the components you need from the XFree86 3.3.2\n"
|
||||
"XFree86 3.3.2.3 Distribution",
|
||||
"Please select the components you need from the XFree86 3.3.2.3\n"
|
||||
"distribution sets.",
|
||||
"Press F1 to read the XFree86 release notes for FreeBSD",
|
||||
"XF86",
|
||||
@ -857,7 +862,7 @@ DMenu MenuXF86Select = {
|
||||
|
||||
DMenu MenuXF86SelectCore = {
|
||||
DMENU_CHECKLIST_TYPE | DMENU_SELECTION_RETURNS,
|
||||
"XFree86 3.3.2 base distribution types",
|
||||
"XFree86 3.3.2.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",
|
||||
@ -884,9 +889,9 @@ DMenu MenuXF86SelectCore = {
|
||||
dmenuFlagCheck, dmenuSetFlag, NULL, &XF86Dists, '[', 'X', ']', DIST_XF86_SET },
|
||||
{ "9set", "XFree86 Setup Utility for PC98 machines",
|
||||
dmenuFlagCheck, dmenuSetFlag, NULL, &XF86Dists, '[', 'X', ']', DIST_XF86_9SET },
|
||||
{ "sources", "XFree86 3.3.2 standard sources",
|
||||
{ "sources", "XFree86 3.3.2.3 standard sources",
|
||||
dmenuFlagCheck, dmenuSetFlag, NULL, &XF86Dists, '[', 'X', ']', DIST_XF86_SRC },
|
||||
{ "csources", "XFree86 3.3.2 contrib sources",
|
||||
{ "csources", "XFree86 3.3.2.3 contrib sources",
|
||||
dmenuFlagCheck, dmenuSetFlag, NULL, &XF86Dists, '[', 'X', ']', DIST_XF86_CSRC },
|
||||
{ "All", "Select all of the above",
|
||||
NULL, setX11Misc, NULL, NULL, ' ', ' ', ' ' },
|
||||
|
||||
@ -22,7 +22,7 @@
|
||||
.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
|
||||
.\" SUCH DAMAGE.
|
||||
.\"
|
||||
.\" $Id: sysinstall.8,v 1.8 1998/05/06 12:01:20 jkh Exp $
|
||||
.\" $Id: sysinstall.8,v 1.9 1998/05/24 20:01:31 jkh Exp $
|
||||
.\"
|
||||
.Dd August 9, 1997
|
||||
.Dt SYSINSTALL 8
|
||||
@ -417,93 +417,93 @@ XFree86 official sources.
|
||||
.It Li XF86-co
|
||||
XFree86 contributed sources.
|
||||
.It Li X332bin
|
||||
XFree86 3.3.2 binaries.
|
||||
XFree86 3.3.2.3 binaries.
|
||||
.It Li X332cfg
|
||||
XFree86 3.3.2 configuration files.
|
||||
XFree86 3.3.2.3 configuration files.
|
||||
.It Li X332doc
|
||||
XFree86 3.3.2 documentation.
|
||||
XFree86 3.3.2.3 documentation.
|
||||
.It Li X332html
|
||||
XFree86 3.3.2 HTML documentation.
|
||||
XFree86 3.3.2.3 HTML documentation.
|
||||
.It Li X332lib
|
||||
XFree86 3.3.2 libraries.
|
||||
XFree86 3.3.2.3 libraries.
|
||||
.It Li X332lk98
|
||||
XFree86 3.3.2 server link-kit for PC98 machines.
|
||||
XFree86 3.3.2.3 server link-kit for PC98 machines.
|
||||
.It Li X332lkit
|
||||
XFree86 3.3.2 server link-kit for standard machines.
|
||||
XFree86 3.3.2.3 server link-kit for standard machines.
|
||||
.It Li X332man
|
||||
XFree86 3.3.2 manual pages.
|
||||
XFree86 3.3.2.3 manual pages.
|
||||
.It Li X332prog
|
||||
XFree86 3.3.2 programmer's distribution.
|
||||
XFree86 3.3.2.3 programmer's distribution.
|
||||
.It Li X332ps
|
||||
XFree86 3.3.2 postscript documentation.
|
||||
XFree86 3.3.2.3 postscript documentation.
|
||||
.It Li X332set
|
||||
XFree86 3.3.2 graphical setup tool.
|
||||
XFree86 3.3.2.3 graphical setup tool.
|
||||
.It Li X3328514
|
||||
XFree86 3.3.2 8514 server.
|
||||
XFree86 3.3.2.3 8514 server.
|
||||
.It Li X3329480
|
||||
XFree86 3.3.2 PC98 8-bit (256 color) PEGC-480 server.
|
||||
XFree86 3.3.2.3 PC98 8-bit (256 color) PEGC-480 server.
|
||||
.It Li X3329EGC
|
||||
XFree86 3.3.2 PC98 4-bit (16 color) EGC server.
|
||||
XFree86 3.3.2.3 PC98 4-bit (16 color) EGC server.
|
||||
.It Li X3329GA9
|
||||
XFree86 3.3.2 PC98 GA-968V4/PCI (S3 968) server.
|
||||
XFree86 3.3.2.3 PC98 GA-968V4/PCI (S3 968) server.
|
||||
.It Li X3329GAN
|
||||
XFree86 3.3.2 PC98 GANB-WAP (cirrus) server.
|
||||
XFree86 3.3.2.3 PC98 GANB-WAP (cirrus) server.
|
||||
.It Li X3329LPW
|
||||
XFree86 3.3.2 PC98 PowerWindowLB (S3) server.
|
||||
XFree86 3.3.2.3 PC98 PowerWindowLB (S3) server.
|
||||
.It Li X3329NKV
|
||||
XFree86 3.3.2 PC98 NKV-NEC (cirrus) server.
|
||||
XFree86 3.3.2.3 PC98 NKV-NEC (cirrus) server.
|
||||
.It Li X3329NS3
|
||||
XFree86 3.3.2 PC98 NEC (S3) server.
|
||||
XFree86 3.3.2.3 PC98 NEC (S3) server.
|
||||
.It Li X3329SPW
|
||||
XFree86 3.3.2 PC98 SKB-PowerWindow (S3) server.
|
||||
XFree86 3.3.2.3 PC98 SKB-PowerWindow (S3) server.
|
||||
.It Li X3329TGU
|
||||
XFree86 3.3.2 PC98 Cyber9320 and TGUI9680 server.
|
||||
XFree86 3.3.2.3 PC98 Cyber9320 and TGUI9680 server.
|
||||
.It Li X3329WEP
|
||||
XFree86 3.3.2 PC98 WAB-EP (cirrus) server.
|
||||
XFree86 3.3.2.3 PC98 WAB-EP (cirrus) server.
|
||||
.It Li X3329WS
|
||||
XFree86 3.3.2 PC98 WABS (cirrus) server.
|
||||
XFree86 3.3.2.3 PC98 WABS (cirrus) server.
|
||||
.It Li X3329WSN
|
||||
XFree86 3.3.2 PC98 WSN-A2F (cirrus) server.
|
||||
XFree86 3.3.2.3 PC98 WSN-A2F (cirrus) server.
|
||||
.It Li X332AGX
|
||||
XFree86 3.3.2 8 bit AGX server.
|
||||
XFree86 3.3.2.3 8 bit AGX server.
|
||||
.It Li X332I128
|
||||
XFree86 3.3.2 #9 Imagine I128 server.
|
||||
XFree86 3.3.2.3 #9 Imagine I128 server.
|
||||
.It Li X332Ma8
|
||||
XFree86 3.3.2 ATI Mach8 server.
|
||||
XFree86 3.3.2.3 ATI Mach8 server.
|
||||
.It Li X332Ma32
|
||||
XFree86 3.3.2 ATI Mach32 server.
|
||||
XFree86 3.3.2.3 ATI Mach32 server.
|
||||
.It Li X332Ma64
|
||||
XFree86 3.3.2 ATI Mach64 server.
|
||||
XFree86 3.3.2.3 ATI Mach64 server.
|
||||
.It Li X332Mono
|
||||
XFree86 3.3.2 monochrome server.
|
||||
XFree86 3.3.2.3 monochrome server.
|
||||
.It Li X332P9K
|
||||
XFree86 3.3.2 P9000 server.
|
||||
XFree86 3.3.2.3 P9000 server.
|
||||
.It Li X332S3
|
||||
XFree86 3.3.2 S3 server.
|
||||
XFree86 3.3.2.3 S3 server.
|
||||
.It Li X332S3V
|
||||
XFree86 3.3.2 S3 Virge server.
|
||||
XFree86 3.3.2.3 S3 Virge server.
|
||||
.It Li X332SVGA
|
||||
XFree86 3.3.2 SVGA server.
|
||||
XFree86 3.3.2.3 SVGA server.
|
||||
.It Li X332VG16
|
||||
XFree86 3.3.2 VGA16 server.
|
||||
XFree86 3.3.2.3 VGA16 server.
|
||||
.It Li X332W32
|
||||
XFree86 3.3.2 ET4000/W32, /W32i and /W32p server.
|
||||
XFree86 3.3.2.3 ET4000/W32, /W32i and /W32p server.
|
||||
.It Li X332nest
|
||||
XFree86 3.3.2 nested X server.
|
||||
XFree86 3.3.2.3 nested X server.
|
||||
.It Li X332vfb
|
||||
XFree86 3.3.2 virtual frame-buffer X server.
|
||||
XFree86 3.3.2.3 virtual frame-buffer X server.
|
||||
.It Li X332fnts
|
||||
XFree86 3.3.2 base font set.
|
||||
XFree86 3.3.2.3 base font set.
|
||||
.It Li X332f100
|
||||
XFree86 3.3.2 100DPI font set.
|
||||
XFree86 3.3.2.3 100DPI font set.
|
||||
.It Li X332fcyr
|
||||
XFree86 3.3.2 Cyrillic font set.
|
||||
XFree86 3.3.2.3 Cyrillic font set.
|
||||
.It Li X332fscl
|
||||
XFree86 3.3.2 scalable font set.
|
||||
XFree86 3.3.2.3 scalable font set.
|
||||
.It Li X332fnon
|
||||
XFree86 3.3.2 non-english font set.
|
||||
XFree86 3.3.2.3 non-english font set.
|
||||
.It Li X332fsrv
|
||||
XFree86 3.3.2 font server.
|
||||
XFree86 3.3.2.3 font server.
|
||||
.El
|
||||
.It distSetDeveloper
|
||||
Selects the standard Developer's distribution set.
|
||||
@ -542,7 +542,7 @@ Interactively select source subcomponents.
|
||||
.Pp
|
||||
\fBVariables:\fR None
|
||||
.It distSetXF86
|
||||
Interactively select XFree86 3.3.2 subcomponents.
|
||||
Interactively select XFree86 3.3.2.3 subcomponents.
|
||||
.Pp
|
||||
\fBVariables:\fR None
|
||||
.It distExtractAll
|
||||
|
||||
@ -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.39 1997/04/03 13:44:56 jkh Exp $
|
||||
* $Id: cdrom.c,v 1.40 1998/01/16 15:07:54 jkh Exp $
|
||||
*
|
||||
* Copyright (c) 1995
|
||||
* Jordan Hubbard. All rights reserved.
|
||||
@ -59,9 +59,9 @@ mediaInitCDROM(Device *dev)
|
||||
{
|
||||
struct iso_args args;
|
||||
Attribs *cd_attr;
|
||||
char *cp;
|
||||
char *cp, *mountpoint = "/dist";
|
||||
Boolean readInfo = TRUE;
|
||||
char *mountpoint = "/dist";
|
||||
static Boolean bogusCDOK = FALSE;
|
||||
|
||||
if (cdromMounted)
|
||||
return TRUE;
|
||||
@ -87,27 +87,30 @@ mediaInitCDROM(Device *dev)
|
||||
cdromMounted = TRUE;
|
||||
}
|
||||
|
||||
if (!file_readable(string_concat(mountpoint, "/cdrom.inf"))) {
|
||||
if (!file_readable(string_concat(mountpoint, "/cdrom.inf")) && !bogusCDOK) {
|
||||
if (msgYesNo("Warning: The CD currently in the drive is either not a FreeBSD\n"
|
||||
"CD or it is an older (pre 2.1.5) FreeBSD CD which does not\n"
|
||||
"have a version number on it. Do you wish to use this CD anyway?") != 0) {
|
||||
unmount(mountpoint, MNT_FORCE);
|
||||
return FALSE;
|
||||
}
|
||||
else
|
||||
else {
|
||||
readInfo = FALSE;
|
||||
bogusCDOK = TRUE;
|
||||
}
|
||||
}
|
||||
|
||||
if (readInfo &&
|
||||
(DITEM_STATUS(attr_parse_file(cd_attr, string_concat(mountpoint, "/cdrom.inf"))) == DITEM_FAILURE ||
|
||||
!(cp = attr_match(cd_attr, "CD_VERSION")) || (strcmp(cp, variable_get(VAR_RELNAME)) && strcmp("none", variable_get(VAR_RELNAME))))) {
|
||||
if (!cp)
|
||||
if (!cp) {
|
||||
msgConfirm("Unable to find a %s/cdrom.inf file.\n"
|
||||
"Either this is not a FreeBSD CDROM, there is a problem with\n"
|
||||
"the CDROM driver or something is wrong with your hardware.\n"
|
||||
"Please fix this problem (check the console logs on VTY2) and\n"
|
||||
"try again.", mountpoint);
|
||||
else
|
||||
}
|
||||
else if (!bogusCDOK) {
|
||||
msgConfirm("Warning: The version of the FreeBSD CD currently in the drive\n"
|
||||
"(%s) does not match the version of the boot floppy\n"
|
||||
"(%s).\n\n"
|
||||
@ -116,10 +119,13 @@ mediaInitCDROM(Device *dev)
|
||||
"string to match that of the CD before selecting it as your\n"
|
||||
"installation media.", cp, variable_get(VAR_RELNAME));
|
||||
|
||||
if (msgYesNo("Would you like to try and use this CDROM anyway?") != 0) {
|
||||
unmount(mountpoint, MNT_FORCE);
|
||||
cdromMounted = FALSE;
|
||||
return FALSE;
|
||||
if (msgYesNo("Would you like to try and use this CDROM anyway?") != 0) {
|
||||
unmount(mountpoint, MNT_FORCE);
|
||||
cdromMounted = FALSE;
|
||||
return FALSE;
|
||||
}
|
||||
else
|
||||
bogusCDOK = TRUE;
|
||||
}
|
||||
}
|
||||
msgDebug("Mounted FreeBSD CDROM from device %s\n", dev->devname);
|
||||
|
||||
@ -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.123 1998/03/10 02:37:25 jkh Exp $
|
||||
* $Id: dist.c,v 1.124 1998/06/10 01:15:46 jkh Exp $
|
||||
*
|
||||
* Copyright (c) 1995
|
||||
* Jordan Hubbard. All rights reserved.
|
||||
@ -261,7 +261,7 @@ distSetXDeveloper(dialogMenuItem *self)
|
||||
int i;
|
||||
|
||||
distReset(NULL);
|
||||
Dists = _DIST_DEVELOPER;
|
||||
Dists = _DIST_DEVELOPER | DIST_XF86;
|
||||
SrcDists = DIST_SRC_ALL;
|
||||
XF86Dists = DIST_XF86_BIN | DIST_XF86_SET | DIST_XF86_CFG | DIST_XF86_LIB | DIST_XF86_PROG | DIST_XF86_MAN | DIST_XF86_SERVER | DIST_XF86_FONTS;
|
||||
XF86ServerDists = DIST_XF86_SERVER_SVGA | DIST_XF86_SERVER_VGA16;
|
||||
@ -302,7 +302,7 @@ distSetXUser(dialogMenuItem *self)
|
||||
int i;
|
||||
|
||||
distReset(NULL);
|
||||
Dists = _DIST_USER;
|
||||
Dists = _DIST_USER | DIST_XF86;
|
||||
XF86ServerDists = DIST_XF86_SERVER_SVGA | DIST_XF86_SERVER_VGA16;
|
||||
XF86Dists = DIST_XF86_BIN | DIST_XF86_SET | DIST_XF86_CFG | DIST_XF86_LIB | DIST_XF86_MAN | DIST_XF86_SERVER | DIST_XF86_FONTS;
|
||||
XF86FontDists = DIST_XF86_FONTS_MISC;
|
||||
|
||||
@ -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.166 1998/05/24 20:01:29 jkh Exp $
|
||||
* $Id: menus.c,v 1.167 1998/07/20 10:48:11 yokota Exp $
|
||||
*
|
||||
* Copyright (c) 1995
|
||||
* Jordan Hubbard. All rights reserved.
|
||||
@ -122,52 +122,57 @@ clearX11Fonts(dialogMenuItem *self)
|
||||
return DITEM_SUCCESS | DITEM_REDRAW;
|
||||
}
|
||||
|
||||
#define IS_DEVELOPER(dist, extra) ((((dist) & (_DIST_DEVELOPER | (extra))) == (_DIST_DEVELOPER | (extra))) || \
|
||||
(((dist) & (_DIST_DEVELOPER | DIST_DES | (extra))) == (_DIST_DEVELOPER | DIST_DES | (extra))))
|
||||
#define IS_USER(dist, extra) ((((dist) & (_DIST_USER | (extra))) == (_DIST_USER | (extra))) || \
|
||||
(((dist) & (_DIST_USER | DIST_DES | (extra))) == (_DIST_USER | DIST_DES | (extra))))
|
||||
#define _IS_SET(dist, set) (((dist) & (set)) == (set))
|
||||
|
||||
#define IS_DEVELOPER(dist, extra) (_IS_SET(dist, _DIST_DEVELOPER | extra) || \
|
||||
_IS_SET(dist, _DIST_DEVELOPER | DIST_DES | extra))
|
||||
|
||||
#define IS_USER(dist, extra) (_IS_SET(dist, _DIST_USER | extra) || \
|
||||
_IS_SET(dist, _DIST_USER | DIST_DES | extra))
|
||||
|
||||
static int
|
||||
checkDistDeveloper(dialogMenuItem *self)
|
||||
{
|
||||
return (IS_DEVELOPER(Dists, 0) && SrcDists == DIST_SRC_ALL);
|
||||
return IS_DEVELOPER(Dists, 0) && _IS_SET(SrcDists, DIST_SRC_ALL);
|
||||
}
|
||||
|
||||
static int
|
||||
checkDistXDeveloper(dialogMenuItem *self)
|
||||
{
|
||||
return (IS_DEVELOPER(Dists, DIST_XF86) && SrcDists == DIST_SRC_ALL);
|
||||
return IS_DEVELOPER(Dists, DIST_XF86) && _IS_SET(SrcDists, DIST_SRC_ALL);
|
||||
}
|
||||
|
||||
static int
|
||||
checkDistKernDeveloper(dialogMenuItem *self)
|
||||
{
|
||||
return (IS_DEVELOPER(Dists, 0) && SrcDists == DIST_SRC_SYS);
|
||||
return IS_DEVELOPER(Dists, 0) && _IS_SET(SrcDists, DIST_SRC_SYS);
|
||||
}
|
||||
|
||||
static int
|
||||
checkDistUser(dialogMenuItem *self)
|
||||
{
|
||||
return (IS_USER(Dists, 0));
|
||||
return IS_USER(Dists, 0);
|
||||
}
|
||||
|
||||
static int
|
||||
checkDistXUser(dialogMenuItem *self)
|
||||
{
|
||||
return (IS_USER(Dists, DIST_XF86));
|
||||
return IS_USER(Dists, DIST_XF86);
|
||||
}
|
||||
|
||||
static int
|
||||
checkDistMinimum(dialogMenuItem *self)
|
||||
{
|
||||
return (Dists == DIST_BIN);
|
||||
return Dists == DIST_BIN;
|
||||
}
|
||||
|
||||
static int
|
||||
checkDistEverything(dialogMenuItem *self)
|
||||
{
|
||||
return (Dists == DIST_ALL && SrcDists == DIST_SRC_ALL && XF86Dists == DIST_XF86_ALL &&
|
||||
XF86ServerDists == DIST_XF86_SERVER_ALL && XF86FontDists == DIST_XF86_FONTS_ALL);
|
||||
return Dists == DIST_ALL && _IS_SET(SrcDists, DIST_SRC_ALL) && \
|
||||
_IS_SET(XF86Dists, DIST_XF86_ALL) && \
|
||||
_IS_SET(XF86ServerDists, DIST_XF86_SERVER_ALL) && \
|
||||
_IS_SET(XF86FontDists, DIST_XF86_FONTS_ALL);
|
||||
}
|
||||
|
||||
static int
|
||||
@ -185,7 +190,7 @@ srcFlagCheck(dialogMenuItem *item)
|
||||
static int
|
||||
x11FlagCheck(dialogMenuItem *item)
|
||||
{
|
||||
return XF86Dists;
|
||||
return Dists & DIST_XF86;
|
||||
}
|
||||
|
||||
static int
|
||||
@ -754,7 +759,7 @@ DMenu MenuSubDistributions = {
|
||||
srcFlagCheck, distSetSrc },
|
||||
{ "ports", "The FreeBSD Ports collection",
|
||||
dmenuFlagCheck, dmenuSetFlag, NULL, &Dists, '[', 'X', ']', DIST_PORTS },
|
||||
{ "XFree86", "The XFree86 3.3.2 distribution",
|
||||
{ "XFree86", "The XFree86 3.3.2.3 distribution",
|
||||
x11FlagCheck, distSetXF86 },
|
||||
{ "All", "All sources, binaries and X Window System binaries",
|
||||
NULL, distSetEverything, NULL, NULL, ' ', ' ', ' ' },
|
||||
@ -841,8 +846,8 @@ DMenu MenuSrcDistributions = {
|
||||
|
||||
DMenu MenuXF86Select = {
|
||||
DMENU_NORMAL_TYPE,
|
||||
"XFree86 3.3.2 Distribution",
|
||||
"Please select the components you need from the XFree86 3.3.2\n"
|
||||
"XFree86 3.3.2.3 Distribution",
|
||||
"Please select the components you need from the XFree86 3.3.2.3\n"
|
||||
"distribution sets.",
|
||||
"Press F1 to read the XFree86 release notes for FreeBSD",
|
||||
"XF86",
|
||||
@ -857,7 +862,7 @@ DMenu MenuXF86Select = {
|
||||
|
||||
DMenu MenuXF86SelectCore = {
|
||||
DMENU_CHECKLIST_TYPE | DMENU_SELECTION_RETURNS,
|
||||
"XFree86 3.3.2 base distribution types",
|
||||
"XFree86 3.3.2.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",
|
||||
@ -884,9 +889,9 @@ DMenu MenuXF86SelectCore = {
|
||||
dmenuFlagCheck, dmenuSetFlag, NULL, &XF86Dists, '[', 'X', ']', DIST_XF86_SET },
|
||||
{ "9set", "XFree86 Setup Utility for PC98 machines",
|
||||
dmenuFlagCheck, dmenuSetFlag, NULL, &XF86Dists, '[', 'X', ']', DIST_XF86_9SET },
|
||||
{ "sources", "XFree86 3.3.2 standard sources",
|
||||
{ "sources", "XFree86 3.3.2.3 standard sources",
|
||||
dmenuFlagCheck, dmenuSetFlag, NULL, &XF86Dists, '[', 'X', ']', DIST_XF86_SRC },
|
||||
{ "csources", "XFree86 3.3.2 contrib sources",
|
||||
{ "csources", "XFree86 3.3.2.3 contrib sources",
|
||||
dmenuFlagCheck, dmenuSetFlag, NULL, &XF86Dists, '[', 'X', ']', DIST_XF86_CSRC },
|
||||
{ "All", "Select all of the above",
|
||||
NULL, setX11Misc, NULL, NULL, ' ', ' ', ' ' },
|
||||
|
||||
@ -22,7 +22,7 @@
|
||||
.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
|
||||
.\" SUCH DAMAGE.
|
||||
.\"
|
||||
.\" $Id: sysinstall.8,v 1.8 1998/05/06 12:01:20 jkh Exp $
|
||||
.\" $Id: sysinstall.8,v 1.9 1998/05/24 20:01:31 jkh Exp $
|
||||
.\"
|
||||
.Dd August 9, 1997
|
||||
.Dt SYSINSTALL 8
|
||||
@ -417,93 +417,93 @@ XFree86 official sources.
|
||||
.It Li XF86-co
|
||||
XFree86 contributed sources.
|
||||
.It Li X332bin
|
||||
XFree86 3.3.2 binaries.
|
||||
XFree86 3.3.2.3 binaries.
|
||||
.It Li X332cfg
|
||||
XFree86 3.3.2 configuration files.
|
||||
XFree86 3.3.2.3 configuration files.
|
||||
.It Li X332doc
|
||||
XFree86 3.3.2 documentation.
|
||||
XFree86 3.3.2.3 documentation.
|
||||
.It Li X332html
|
||||
XFree86 3.3.2 HTML documentation.
|
||||
XFree86 3.3.2.3 HTML documentation.
|
||||
.It Li X332lib
|
||||
XFree86 3.3.2 libraries.
|
||||
XFree86 3.3.2.3 libraries.
|
||||
.It Li X332lk98
|
||||
XFree86 3.3.2 server link-kit for PC98 machines.
|
||||
XFree86 3.3.2.3 server link-kit for PC98 machines.
|
||||
.It Li X332lkit
|
||||
XFree86 3.3.2 server link-kit for standard machines.
|
||||
XFree86 3.3.2.3 server link-kit for standard machines.
|
||||
.It Li X332man
|
||||
XFree86 3.3.2 manual pages.
|
||||
XFree86 3.3.2.3 manual pages.
|
||||
.It Li X332prog
|
||||
XFree86 3.3.2 programmer's distribution.
|
||||
XFree86 3.3.2.3 programmer's distribution.
|
||||
.It Li X332ps
|
||||
XFree86 3.3.2 postscript documentation.
|
||||
XFree86 3.3.2.3 postscript documentation.
|
||||
.It Li X332set
|
||||
XFree86 3.3.2 graphical setup tool.
|
||||
XFree86 3.3.2.3 graphical setup tool.
|
||||
.It Li X3328514
|
||||
XFree86 3.3.2 8514 server.
|
||||
XFree86 3.3.2.3 8514 server.
|
||||
.It Li X3329480
|
||||
XFree86 3.3.2 PC98 8-bit (256 color) PEGC-480 server.
|
||||
XFree86 3.3.2.3 PC98 8-bit (256 color) PEGC-480 server.
|
||||
.It Li X3329EGC
|
||||
XFree86 3.3.2 PC98 4-bit (16 color) EGC server.
|
||||
XFree86 3.3.2.3 PC98 4-bit (16 color) EGC server.
|
||||
.It Li X3329GA9
|
||||
XFree86 3.3.2 PC98 GA-968V4/PCI (S3 968) server.
|
||||
XFree86 3.3.2.3 PC98 GA-968V4/PCI (S3 968) server.
|
||||
.It Li X3329GAN
|
||||
XFree86 3.3.2 PC98 GANB-WAP (cirrus) server.
|
||||
XFree86 3.3.2.3 PC98 GANB-WAP (cirrus) server.
|
||||
.It Li X3329LPW
|
||||
XFree86 3.3.2 PC98 PowerWindowLB (S3) server.
|
||||
XFree86 3.3.2.3 PC98 PowerWindowLB (S3) server.
|
||||
.It Li X3329NKV
|
||||
XFree86 3.3.2 PC98 NKV-NEC (cirrus) server.
|
||||
XFree86 3.3.2.3 PC98 NKV-NEC (cirrus) server.
|
||||
.It Li X3329NS3
|
||||
XFree86 3.3.2 PC98 NEC (S3) server.
|
||||
XFree86 3.3.2.3 PC98 NEC (S3) server.
|
||||
.It Li X3329SPW
|
||||
XFree86 3.3.2 PC98 SKB-PowerWindow (S3) server.
|
||||
XFree86 3.3.2.3 PC98 SKB-PowerWindow (S3) server.
|
||||
.It Li X3329TGU
|
||||
XFree86 3.3.2 PC98 Cyber9320 and TGUI9680 server.
|
||||
XFree86 3.3.2.3 PC98 Cyber9320 and TGUI9680 server.
|
||||
.It Li X3329WEP
|
||||
XFree86 3.3.2 PC98 WAB-EP (cirrus) server.
|
||||
XFree86 3.3.2.3 PC98 WAB-EP (cirrus) server.
|
||||
.It Li X3329WS
|
||||
XFree86 3.3.2 PC98 WABS (cirrus) server.
|
||||
XFree86 3.3.2.3 PC98 WABS (cirrus) server.
|
||||
.It Li X3329WSN
|
||||
XFree86 3.3.2 PC98 WSN-A2F (cirrus) server.
|
||||
XFree86 3.3.2.3 PC98 WSN-A2F (cirrus) server.
|
||||
.It Li X332AGX
|
||||
XFree86 3.3.2 8 bit AGX server.
|
||||
XFree86 3.3.2.3 8 bit AGX server.
|
||||
.It Li X332I128
|
||||
XFree86 3.3.2 #9 Imagine I128 server.
|
||||
XFree86 3.3.2.3 #9 Imagine I128 server.
|
||||
.It Li X332Ma8
|
||||
XFree86 3.3.2 ATI Mach8 server.
|
||||
XFree86 3.3.2.3 ATI Mach8 server.
|
||||
.It Li X332Ma32
|
||||
XFree86 3.3.2 ATI Mach32 server.
|
||||
XFree86 3.3.2.3 ATI Mach32 server.
|
||||
.It Li X332Ma64
|
||||
XFree86 3.3.2 ATI Mach64 server.
|
||||
XFree86 3.3.2.3 ATI Mach64 server.
|
||||
.It Li X332Mono
|
||||
XFree86 3.3.2 monochrome server.
|
||||
XFree86 3.3.2.3 monochrome server.
|
||||
.It Li X332P9K
|
||||
XFree86 3.3.2 P9000 server.
|
||||
XFree86 3.3.2.3 P9000 server.
|
||||
.It Li X332S3
|
||||
XFree86 3.3.2 S3 server.
|
||||
XFree86 3.3.2.3 S3 server.
|
||||
.It Li X332S3V
|
||||
XFree86 3.3.2 S3 Virge server.
|
||||
XFree86 3.3.2.3 S3 Virge server.
|
||||
.It Li X332SVGA
|
||||
XFree86 3.3.2 SVGA server.
|
||||
XFree86 3.3.2.3 SVGA server.
|
||||
.It Li X332VG16
|
||||
XFree86 3.3.2 VGA16 server.
|
||||
XFree86 3.3.2.3 VGA16 server.
|
||||
.It Li X332W32
|
||||
XFree86 3.3.2 ET4000/W32, /W32i and /W32p server.
|
||||
XFree86 3.3.2.3 ET4000/W32, /W32i and /W32p server.
|
||||
.It Li X332nest
|
||||
XFree86 3.3.2 nested X server.
|
||||
XFree86 3.3.2.3 nested X server.
|
||||
.It Li X332vfb
|
||||
XFree86 3.3.2 virtual frame-buffer X server.
|
||||
XFree86 3.3.2.3 virtual frame-buffer X server.
|
||||
.It Li X332fnts
|
||||
XFree86 3.3.2 base font set.
|
||||
XFree86 3.3.2.3 base font set.
|
||||
.It Li X332f100
|
||||
XFree86 3.3.2 100DPI font set.
|
||||
XFree86 3.3.2.3 100DPI font set.
|
||||
.It Li X332fcyr
|
||||
XFree86 3.3.2 Cyrillic font set.
|
||||
XFree86 3.3.2.3 Cyrillic font set.
|
||||
.It Li X332fscl
|
||||
XFree86 3.3.2 scalable font set.
|
||||
XFree86 3.3.2.3 scalable font set.
|
||||
.It Li X332fnon
|
||||
XFree86 3.3.2 non-english font set.
|
||||
XFree86 3.3.2.3 non-english font set.
|
||||
.It Li X332fsrv
|
||||
XFree86 3.3.2 font server.
|
||||
XFree86 3.3.2.3 font server.
|
||||
.El
|
||||
.It distSetDeveloper
|
||||
Selects the standard Developer's distribution set.
|
||||
@ -542,7 +542,7 @@ Interactively select source subcomponents.
|
||||
.Pp
|
||||
\fBVariables:\fR None
|
||||
.It distSetXF86
|
||||
Interactively select XFree86 3.3.2 subcomponents.
|
||||
Interactively select XFree86 3.3.2.3 subcomponents.
|
||||
.Pp
|
||||
\fBVariables:\fR None
|
||||
.It distExtractAll
|
||||
|
||||
Loading…
Reference in New Issue
Block a user