diff options
| -rw-r--r-- | release/sysinstall/dist.c | 5 | ||||
| -rw-r--r-- | release/sysinstall/menus.c | 18 |
2 files changed, 12 insertions, 11 deletions
diff --git a/release/sysinstall/dist.c b/release/sysinstall/dist.c index e70f446fde48..179f4a325100 100644 --- a/release/sysinstall/dist.c +++ b/release/sysinstall/dist.c @@ -290,8 +290,7 @@ distSetDeveloper(dialogMenuItem *self) distReset(NULL); Dists = _DIST_DEVELOPER; SrcDists = DIST_SRC_ALL; - CRYPTODists |= (DIST_CRYPTO_SCRYPTO | DIST_CRYPTO_SSECURE | - DIST_CRYPTO_SKERBEROS4 | DIST_CRYPTO_SKERBEROS5); + CRYPTODists = DIST_CRYPTO_ALL; i = distMaybeSetPorts(self); distVerifyFlags(); return i; @@ -316,6 +315,7 @@ distSetKernDeveloper(dialogMenuItem *self) distReset(NULL); Dists = _DIST_DEVELOPER; SrcDists = DIST_SRC_SYS; + CRYPTODists |= DIST_CRYPTO_BIN; i = distMaybeSetPorts(self); distVerifyFlags(); return i; @@ -339,6 +339,7 @@ distSetUser(dialogMenuItem *self) distReset(NULL); Dists = _DIST_USER; + CRYPTODists |= DIST_CRYPTO_BIN; i = distMaybeSetPorts(self); distVerifyFlags(); return i; diff --git a/release/sysinstall/menus.c b/release/sysinstall/menus.c index c4d1e9014818..36b84bfdc15d 100644 --- a/release/sysinstall/menus.c +++ b/release/sysinstall/menus.c @@ -1466,15 +1466,15 @@ DMenu MenuSysconsKeymap = { { " 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. CapsLock->Ctrl", "United States standard with Caps Lock acting as left Control", dmenuVarCheck, dmenuSetKmapVariable, NULL, "keymap=us.pc-ctrl" }, - { " U.S. Dvorak", "United States Dvorak keymap", dmenuVarCheck, dmenuSetKmapVariable, NULL, "keymap=us.dvorak" }, - { " U.S. Dvorak (left)", "United States left handed Dvorak keymap", dmenuVarCheck, dmenuSetKmapVariable, NULL, "keymap=us.dvorakl" }, - { " U.S. Dvorak (right)", "United States right handed Dvorak keymap", dmenuVarCheck, dmenuSetKmapVariable, NULL, "keymap=us.dvorakr" }, - { " U.S. Emacs", "United States standard optimized for EMACS use", dmenuVarCheck, dmenuSetKmapVariable, NULL, "keymap=us.emacs" }, - { " U.S. ISO", "United States ISO keymap", dmenuVarCheck, dmenuSetKmapVariable, NULL, "keymap=us.iso" }, - { " U.S. UNIX", "United States traditional UNIX-workstation keymap", dmenuVarCheck, dmenuSetKmapVariable, NULL, "keymap=us.unix" }, + { "UK CP850", "UK Code Page 850 keymap", dmenuVarCheck, dmenuSetKmapVariable, NULL, "keymap=uk.cp850" }, + { " UK ISO", "UK ISO keymap", dmenuVarCheck, dmenuSetKmapVariable, NULL, "keymap=uk.iso" }, + { " USA CapsLock->Ctrl", "US standard with Caps Lock acting as left Control", dmenuVarCheck, dmenuSetKmapVariable, NULL, "keymap=us.pc-ctrl" }, + { " USA Dvorak", "US Dvorak keymap", dmenuVarCheck, dmenuSetKmapVariable, NULL, "keymap=us.dvorak" }, + { " USA Dvorak (left)", "US left handed Dvorak keymap", dmenuVarCheck, dmenuSetKmapVariable, NULL, "keymap=us.dvorakl" }, + { " USA Dvorak (right)", "US right handed Dvorak keymap", dmenuVarCheck, dmenuSetKmapVariable, NULL, "keymap=us.dvorakr" }, + { " USA Emacs", "US standard optimized for EMACS use", dmenuVarCheck, dmenuSetKmapVariable, NULL, "keymap=us.emacs" }, + { " USA ISO", "US ISO keymap", dmenuVarCheck, dmenuSetKmapVariable, NULL, "keymap=us.iso" }, + { " USA UNIX", "US traditional UNIX-workstation keymap", dmenuVarCheck, dmenuSetKmapVariable, NULL, "keymap=us.unix" }, { NULL } }, }; |