summaryrefslogtreecommitdiffstats
path: root/mdk-stage1
diff options
context:
space:
mode:
authorGuillaume Cottenceau <gc@mandriva.com>2004-02-10 17:05:57 +0000
committerGuillaume Cottenceau <gc@mandriva.com>2004-02-10 17:05:57 +0000
commitd76c8f91dddc6a0827a281e1501ef515f49ebfcd (patch)
tree54500dde431d66df7e3a970fef3ae0958ca1c8d0 /mdk-stage1
parent09fb7bb3267367ad9e0742ff41ff7981dd21fbf0 (diff)
downloaddrakx-d76c8f91dddc6a0827a281e1501ef515f49ebfcd.tar
drakx-d76c8f91dddc6a0827a281e1501ef515f49ebfcd.tar.gz
drakx-d76c8f91dddc6a0827a281e1501ef515f49ebfcd.tar.bz2
drakx-d76c8f91dddc6a0827a281e1501ef515f49ebfcd.tar.xz
drakx-d76c8f91dddc6a0827a281e1501ef515f49ebfcd.zip
use floppy_device rather than /dev/fd0 because we now support usb floppies as well
Diffstat (limited to 'mdk-stage1')
-rw-r--r--mdk-stage1/modules.c4
-rw-r--r--mdk-stage1/stage1.c2
2 files changed, 3 insertions, 3 deletions
diff --git a/mdk-stage1/modules.c b/mdk-stage1/modules.c
index f33224cd6..719e98ca1 100644
--- a/mdk-stage1/modules.c
+++ b/mdk-stage1/modules.c
@@ -106,7 +106,7 @@ static enum return_type ensure_additional_modules_available(void)
stg1_info_message("Please insert the Additional Drivers floppy.");;
my_insmod("floppy", ANY_DRIVER_TYPE, NULL, 0);
- while (my_mount("/dev/fd0", floppy_mount_location, "ext2", 0) == -1) {
+ while (my_mount(floppy_device(), floppy_mount_location, "ext2", 0) == -1) {
enum return_type results = ask_yes_no(errno == ENXIO ?
"There is no detected floppy drive, or no floppy disk in drive.\nRetry?"
: errno == EINVAL ?
@@ -539,7 +539,7 @@ void update_modules(void)
my_insmod("floppy", ANY_DRIVER_TYPE, NULL, 0);
- if (my_mount("/dev/fd0", floppy_mount_location, "ext2", 0) == -1) {
+ if (my_mount(floppy_device(), floppy_mount_location, "ext2", 0) == -1) {
enum return_type results = ask_yes_no("I can't find a Linux ext2 floppy in first floppy drive.\n"
"Retry?");
if (results == RETURN_OK)
diff --git a/mdk-stage1/stage1.c b/mdk-stage1/stage1.c
index 2e1cb0972..c5452ce90 100644
--- a/mdk-stage1/stage1.c
+++ b/mdk-stage1/stage1.c
@@ -232,7 +232,7 @@ static void expert_third_party_modules(void)
my_insmod("floppy", ANY_DRIVER_TYPE, NULL, 0);
- if (my_mount("/dev/fd0", floppy_mount_location, "ext2", 0) == -1) {
+ if (my_mount(floppy_device(), floppy_mount_location, "ext2", 0) == -1) {
stg1_error_message("I can't find a Linux ext2 floppy in first floppy drive.");
return expert_third_party_modules();
}