summaryrefslogtreecommitdiffstats
path: root/mdk-stage1/mount.c
diff options
context:
space:
mode:
authorGuillaume Cottenceau <gc@mandriva.com>2004-01-22 17:09:00 +0000
committerGuillaume Cottenceau <gc@mandriva.com>2004-01-22 17:09:00 +0000
commit147317297c20ab596f239c8f3947ed3e2290282e (patch)
tree6e2a3d285addc44365d79ee305a8677bebabab7a /mdk-stage1/mount.c
parentea1ae4d01e69b2bd24896315c88eb072c3874e1d (diff)
downloaddrakx-147317297c20ab596f239c8f3947ed3e2290282e.tar
drakx-147317297c20ab596f239c8f3947ed3e2290282e.tar.gz
drakx-147317297c20ab596f239c8f3947ed3e2290282e.tar.bz2
drakx-147317297c20ab596f239c8f3947ed3e2290282e.tar.xz
drakx-147317297c20ab596f239c8f3947ed3e2290282e.zip
until we haven't loaded the usb interface and the keyboard usb driver, we can't allow asking for additional drivers floppy, so need another parameter to my_insmod to indicate in which situation we are
Diffstat (limited to 'mdk-stage1/mount.c')
-rw-r--r--mdk-stage1/mount.c12
1 files changed, 6 insertions, 6 deletions
diff --git a/mdk-stage1/mount.c b/mdk-stage1/mount.c
index 64ae759f9..e4fd2ddd8 100644
--- a/mdk-stage1/mount.c
+++ b/mdk-stage1/mount.c
@@ -185,8 +185,8 @@ int my_mount(char *dev, char *location, char *fs, int force_rw)
}
if (!strcmp(fs, "supermount")) {
- my_insmod("supermount", ANY_DRIVER_TYPE, NULL);
- my_insmod("isofs", ANY_DRIVER_TYPE, NULL);
+ my_insmod("supermount", ANY_DRIVER_TYPE, NULL, 1);
+ my_insmod("isofs", ANY_DRIVER_TYPE, NULL, 1);
opts = alloca(500);
sprintf(opts, "dev=%s,fs=iso9660,tray_lock=always", dev);
dev = "none";
@@ -194,20 +194,20 @@ int my_mount(char *dev, char *location, char *fs, int force_rw)
#ifndef DISABLE_MEDIAS
if (!strcmp(fs, "vfat")) {
- my_insmod("vfat", ANY_DRIVER_TYPE, NULL);
+ my_insmod("vfat", ANY_DRIVER_TYPE, NULL, 1);
opts = "check=relaxed";
}
if (!strcmp(fs, "reiserfs"))
- my_insmod("reiserfs", ANY_DRIVER_TYPE, NULL);
+ my_insmod("reiserfs", ANY_DRIVER_TYPE, NULL, 1);
#endif
if (!strcmp(fs, "iso9660"))
- my_insmod("isofs", ANY_DRIVER_TYPE, NULL);
+ my_insmod("isofs", ANY_DRIVER_TYPE, NULL, 1);
#ifndef DISABLE_NETWORK
if (!strcmp(fs, "nfs")) {
- my_insmod("nfs", ANY_DRIVER_TYPE, NULL);
+ my_insmod("nfs", ANY_DRIVER_TYPE, NULL, 1);
log_message("preparing nfsmount for %s", dev);
rc = nfsmount_prepare(dev, &opts);
if (rc != 0)