From 15cde219d18f3e15dc164fe69edd7d818b6152cb Mon Sep 17 00:00:00 2001 From: "Jordan K. Hubbard" Date: Mon, 17 Feb 1997 04:56:22 +0000 Subject: [PATCH] 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. --- release/sysinstall/dist.c | 6 +++--- usr.sbin/sysinstall/dist.c | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/release/sysinstall/dist.c b/release/sysinstall/dist.c index d8767712bfee..d6229f1de621 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); } diff --git a/usr.sbin/sysinstall/dist.c b/usr.sbin/sysinstall/dist.c index d8767712bfee..d6229f1de621 100644 --- a/usr.sbin/sysinstall/dist.c +++ b/usr.sbin/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); }