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 | |
| 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')
| -rw-r--r-- | usr.sbin/sysinstall/dist.c | 6 | ||||
| -rw-r--r-- | usr.sbin/sysinstall/menus.c | 11 |
2 files changed, 15 insertions, 2 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; diff --git a/usr.sbin/sysinstall/menus.c b/usr.sbin/sysinstall/menus.c index d3f039a..c0ebe85 100644 --- a/usr.sbin/sysinstall/menus.c +++ b/usr.sbin/sysinstall/menus.c @@ -1427,6 +1427,9 @@ DMenu MenuSysconsKeymap = { { "Croatian ISO", "Croatian ISO keymap", dmenuVarCheck, dmenuSetKmapVariable, NULL, "keymap=hr.iso" }, { "Danish CP865", "Danish Code Page 865 keymap", dmenuVarCheck, dmenuSetKmapVariable, NULL, "keymap=danish.cp865" }, { "Danish ISO", "Danish ISO keymap", dmenuVarCheck, dmenuSetKmapVariable, NULL, "keymap=danish.iso" }, + { "Estonian ISO", "Estonian ISO keymap", dmenuVarCheck, dmenuSetKmapVariable, NULL, "keymap=estonian.iso" }, + { "Estonian ISO 15", "Estonian ISO 8859-15 keymap", dmenuVarCheck, dmenuSetKmapVariable, NULL, "keymap=estonian.iso15" }, + { "Estonian CP850", "Estonian Code Page 850 keymap", dmenuVarCheck, dmenuSetKmapVariable, NULL, "keymap=estonian.cp850" }, { "Finnish CP850","Finnish Code Page 850 keymap", dmenuVarCheck, dmenuSetKmapVariable, NULL, "keymap=finnish.cp850" }, { "Finnish ISO", "Finnish ISO keymap", dmenuVarCheck, dmenuSetKmapVariable, NULL, "keymap=finnish.iso" }, { "French ISO (accent)", "French ISO keymap (accent keys)", dmenuVarCheck, dmenuSetKmapVariable, NULL, "keymap=fr.iso.acc" }, @@ -1451,8 +1454,12 @@ DMenu MenuSysconsKeymap = { { "Spanish", "Spanish ISO keymap", dmenuVarCheck, dmenuSetKmapVariable, NULL, "keymap=spanish.iso" }, { "Swedish CP850", "Swedish Code Page 850 keymap", dmenuVarCheck, dmenuSetKmapVariable, NULL, "keymap=swedish.cp850" }, { "Swedish ISO", "Swedish ISO keymap", dmenuVarCheck, dmenuSetKmapVariable, NULL, "keymap=swedish.iso" }, - { "Swiss French", "Swiss French ISO keymap", dmenuVarCheck, dmenuSetKmapVariable, NULL, "keymap=swissfrench.iso" }, - { "Swiss German", "Swiss German ISO keymap", dmenuVarCheck, dmenuSetKmapVariable, NULL, "keymap=swissgerman.iso" }, + { "Swiss French ISO (accent)", "Swiss French ISO keymap (accent keys)", dmenuVarCheck, dmenuSetKmapVariable, NULL, "keymap=swissfrench.iso.acc" }, + { "Swiss French ISO", "Swiss French ISO keymap", dmenuVarCheck, dmenuSetKmapVariable, NULL, "keymap=swissfrench.iso" }, + { "Swiss French CP850", "Swiss French Code Page 850 keymap", dmenuVarCheck, dmenuSetKmapVariable, NULL, "keymap=swissfrench.cp850" }, + { "Swiss German ISO (accent)", "Swiss German ISO keymap (accent keys)", dmenuVarCheck, dmenuSetKmapVariable, NULL, "keymap=swissgerman.iso.acc" }, + { "Swiss German ISO", "Swiss German ISO keymap", dmenuVarCheck, dmenuSetKmapVariable, NULL, "keymap=swissgerman.iso" }, + { "Swiss German CP850", "Swiss German Code Page 850 keymap", dmenuVarCheck, dmenuSetKmapVariable, NULL, "keymap=swissgerman.cp850" }, { "U.K. CP850", "United Kingdom Code Page 850 keymap", dmenuVarCheck, dmenuSetKmapVariable, NULL, "keymap=uk.cp850" }, { "U.K. ISO", "United Kingdom ISO keymap", dmenuVarCheck, dmenuSetKmapVariable, NULL, "keymap=uk.iso" }, { "U.S. Dvorak", "United States Dvorak keymap", dmenuVarCheck, dmenuSetKmapVariable, NULL, "keymap=us.dvorak" }, |
