summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThierry Vignaud <tv@mageia.org>2012-04-26 17:17:14 +0000
committerThierry Vignaud <tv@mageia.org>2012-04-26 17:17:14 +0000
commit4ebe143568eaaeae5e66f2cab2c836383e54b462 (patch)
treeca34e87ae1af5562742e987bb7c634287a265c37
parent4edc66c6caf2b8a417582e41acf439e77016483b (diff)
downloaddrakx-4ebe143568eaaeae5e66f2cab2c836383e54b462.tar
drakx-4ebe143568eaaeae5e66f2cab2c836383e54b462.tar.gz
drakx-4ebe143568eaaeae5e66f2cab2c836383e54b462.tar.bz2
drakx-4ebe143568eaaeae5e66f2cab2c836383e54b462.tar.xz
drakx-4ebe143568eaaeae5e66f2cab2c836383e54b462.zip
do not advice long dead pcmcia.img & network.img images (mga#5466)
-rw-r--r--mdk-stage1/NEWS2
-rw-r--r--mdk-stage1/network.c3
2 files changed, 3 insertions, 2 deletions
diff --git a/mdk-stage1/NEWS b/mdk-stage1/NEWS
index 8b1696319..7b0918ce6 100644
--- a/mdk-stage1/NEWS
+++ b/mdk-stage1/NEWS
@@ -1,3 +1,5 @@
+- do not advice long dead pcmcia.img & network.img images (mga#5466)
+
1.65
- load btrfs module to mount btrfs
- try mounting as btrfs
diff --git a/mdk-stage1/network.c b/mdk-stage1/network.c
index d82ca28d5..e86c5a829 100644
--- a/mdk-stage1/network.c
+++ b/mdk-stage1/network.c
@@ -691,8 +691,7 @@ static char * interface_select(void)
}
if (count == 0) {
- stg1_error_message("No NET device found.\n"
- "Hint: if you're using a Laptop, note that PCMCIA Network adapters are now supported either with `pcmcia.img' or `network.img', please try both these bootdisks.");
+ stg1_error_message("No NET device found.");
i = ask_insmod(NETWORK_DEVICES);
if (i == RETURN_BACK)
return NULL;