summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMartin Whitaker <mageia@martin-whitaker.me.uk>2020-11-29 10:36:29 +0000
committerMartin Whitaker <mageia@martin-whitaker.me.uk>2020-11-29 10:37:57 +0000
commit6656d579db6cc6e5fc4e0563e8964d4c6217442b (patch)
tree7158487cbda9c86780dcc0249e9a8aa09599209e
parent5474adbbe981ee2b576e0fb1a66df5c0d70af386 (diff)
downloaddrakx-6656d579db6cc6e5fc4e0563e8964d4c6217442b.tar
drakx-6656d579db6cc6e5fc4e0563e8964d4c6217442b.tar.gz
drakx-6656d579db6cc6e5fc4e0563e8964d4c6217442b.tar.bz2
drakx-6656d579db6cc6e5fc4e0563e8964d4c6217442b.tar.xz
drakx-6656d579db6cc6e5fc4e0563e8964d4c6217442b.zip
Improve stage 1 installer help for entering wireless keys/passphrases.
Note that ASCII strings can now be used for WEP keys (mga#21042).
-rw-r--r--mdk-stage1/NEWS3
-rw-r--r--mdk-stage1/wireless.c5
2 files changed, 6 insertions, 2 deletions
diff --git a/mdk-stage1/NEWS b/mdk-stage1/NEWS
index ec0e0065b..c2d2c7964 100644
--- a/mdk-stage1/NEWS
+++ b/mdk-stage1/NEWS
@@ -1,3 +1,6 @@
+- improve help for entering wireless keys/passphrases
+ o note that ASCII strings can now be used for WEP keys (mga#21042)
+
2.50
- add support for WPA/WPA2 (mga#9541)
diff --git a/mdk-stage1/wireless.c b/mdk-stage1/wireless.c
index 42039ef7a..3d948c7e5 100644
--- a/mdk-stage1/wireless.c
+++ b/mdk-stage1/wireless.c
@@ -92,14 +92,15 @@ enum return_type configure_wireless(const char *ifname)
if (streq(choice, security[2])) {
message = "Please enter your wireless settings. "
"The ESSID is your wireless network identifier. "
- "The passphrase must be a string of 8 to 63 ASCII characters.";
+ "The passphrase must be a string of between 8 and 63 ASCII characters.";
questions[1] = "passphrase";
questions_auto[1] = "wpa_psk";
key_mgmt = "WPA-PSK";
} else if (streq(choice, security[1])) {
message = "Please enter your wireless settings. "
"The ESSID is your wireless network identifier. "
- "The WEP key must be a string of 10 or 26 hexadecimal digits, without any separators.";
+ "The WEP key must be either a string of 10 or 26 hexadecimal digits, without any separators, "
+ "or a string of 5 or 13 ASCII characters enclosed in double quote marks (e.g. \"12345\").";
questions[1] = "WEP key";
questions_auto[1] = "wep_key";
key_mgmt = "NONE";