diff options
| author | jkh <jkh@FreeBSD.org> | 1999-12-01 01:34:33 +0000 |
|---|---|---|
| committer | jkh <jkh@FreeBSD.org> | 1999-12-01 01:34:33 +0000 |
| commit | 4a057a051637196347444904a661495efcdbb941 (patch) | |
| tree | b3d4a943dd2e4727ad565fe72b87d1882ce5e1b0 /usr.sbin/sysinstall/dist.c | |
| parent | e483373e23122f0a1d3c0568ec6bedec3e5c1430 (diff) | |
| download | FreeBSD-src-4a057a051637196347444904a661495efcdbb941.zip FreeBSD-src-4a057a051637196347444904a661495efcdbb941.tar.gz | |
Don't make the failure of a LOCAL dist a reported error.
If we're running 4.x and install X, auto-select COMPAT3X.
Diffstat (limited to 'usr.sbin/sysinstall/dist.c')
| -rw-r--r-- | usr.sbin/sysinstall/dist.c | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/usr.sbin/sysinstall/dist.c b/usr.sbin/sysinstall/dist.c index edb8232..f1e1149 100644 --- a/usr.sbin/sysinstall/dist.c +++ b/usr.sbin/sysinstall/dist.c @@ -212,6 +212,9 @@ distVerifyFlags(void) Dists |= DIST_XF86; #ifdef __i386__ Dists |= DIST_COMPAT22; /* For certain old X applications */ +#if __FreeBSD__ > 3 + Dists |= DIST_COMPAT3X; +#endif #endif } if (isDebug()) @@ -867,6 +870,9 @@ distExtractAll(dialogMenuItem *self) if (old_dists & DIST_XF86) status |= installFixupXFree(self); + /* Clear any local dist flags now */ + Dists &= ~DIST_LOCAL; + if (Dists) { int col = 0; |
