summaryrefslogtreecommitdiffstats
path: root/release
diff options
context:
space:
mode:
authorjkh <jkh@FreeBSD.org>1997-02-17 04:56:22 +0000
committerjkh <jkh@FreeBSD.org>1997-02-17 04:56:22 +0000
commit603dfc46ce6fc299aa98a3eda19101a65d2a8fec (patch)
treed1f9af9b364cde0296d93e7aa726dafbe269a13c /release
parent0998262e67c6e3ae7f2aa8030d69b8ca29004d5e (diff)
downloadFreeBSD-src-603dfc46ce6fc299aa98a3eda19101a65d2a8fec.zip
FreeBSD-src-603dfc46ce6fc299aa98a3eda19101a65d2a8fec.tar.gz
Always load DIST_COMPAT21 when loading X. This used to be the default
then it got taken out when the COMPAT21 distribution got dangerous. Now that it's safe (we hope), it comes back.
Diffstat (limited to 'release')
-rw-r--r--release/sysinstall/dist.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/release/sysinstall/dist.c b/release/sysinstall/dist.c
index d876771..d6229f1 100644
--- a/release/sysinstall/dist.c
+++ b/release/sysinstall/dist.c
@@ -202,7 +202,7 @@ distSetXDeveloper(dialogMenuItem *self)
distReset(NULL);
Dists = _DIST_DEVELOPER;
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;
+ XF86Dists = DIST_XF86_BIN | DIST_COMPAT21 | DIST_XF86_SET | DIST_XF86_CFG | DIST_XF86_LIB | DIST_XF86_PROG | DIST_XF86_MAN | DIST_XF86_SERVER | DIST_XF86_FONTS;
XF86ServerDists = DIST_XF86_SERVER_SVGA | DIST_XF86_SERVER_VGA16;
XF86FontDists = DIST_XF86_FONTS_MISC;
return distSetXF86(NULL) | distMaybeSetDES(self);
@@ -230,7 +230,7 @@ distSetXUser(dialogMenuItem *self)
{
distReset(NULL);
Dists = _DIST_USER;
- XF86Dists = DIST_XF86_BIN | DIST_XF86_SET | DIST_XF86_CFG | DIST_XF86_LIB | DIST_XF86_MAN | DIST_XF86_SERVER | DIST_XF86_FONTS;
+ XF86Dists = DIST_XF86_BIN | DIST_COMPAT21 | DIST_XF86_SET | DIST_XF86_CFG | DIST_XF86_LIB | DIST_XF86_MAN | DIST_XF86_SERVER | DIST_XF86_FONTS;
XF86ServerDists = DIST_XF86_SERVER_SVGA | DIST_XF86_SERVER_VGA16;
XF86FontDists = DIST_XF86_FONTS_MISC;
return distSetXF86(NULL) | distMaybeSetDES(self);
@@ -331,7 +331,7 @@ distSetXF86(dialogMenuItem *self)
if (XF86FontDists)
XF86Dists |= DIST_XF86_FONTS;
if (XF86Dists)
- Dists |= DIST_XF86;
+ Dists |= (DIST_XF86 | DIST_COMPAT21);
msgDebug("SetXF86 Masks: Server: %0x, Fonts: %0x, XDists: %0x, Dists: %0x\n",
XF86ServerDists, XF86FontDists, XF86Dists, Dists);
}
OpenPOWER on IntegriCloud