summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGuillaume Cottenceau <gc@mandriva.com>2003-10-18 22:33:17 +0000
committerGuillaume Cottenceau <gc@mandriva.com>2003-10-18 22:33:17 +0000
commit023bf827ed7bdc86ee299b224e50418b1e2b13ac (patch)
tree9879675a000a7bb0ae910a0137348e361e38f1b4
parent673ead66567478de006650e4a502b81d08652b4c (diff)
downloaddrakx-023bf827ed7bdc86ee299b224e50418b1e2b13ac.tar
drakx-023bf827ed7bdc86ee299b224e50418b1e2b13ac.tar.gz
drakx-023bf827ed7bdc86ee299b224e50418b1e2b13ac.tar.bz2
drakx-023bf827ed7bdc86ee299b224e50418b1e2b13ac.tar.xz
drakx-023bf827ed7bdc86ee299b224e50418b1e2b13ac.zip
nfs, cloop
-rw-r--r--mdk-stage1/mount.c8
1 files changed, 2 insertions, 6 deletions
diff --git a/mdk-stage1/mount.c b/mdk-stage1/mount.c
index 8e0ef31e5..1503a95e6 100644
--- a/mdk-stage1/mount.c
+++ b/mdk-stage1/mount.c
@@ -127,9 +127,6 @@ int ensure_dev_exists(char *dev)
minor = 8 * charstar_to_int(ptr+1);
ptr = strchr(ptr, 'p');
minor += charstar_to_int(ptr+1);
- } else if (ptr_begins_static_str(name, "cloop")) {
- major = 240;
- minor = name[5] - '0';
} else {
log_message("I don't know how to create device %s, please post bugreport to me!", dev);
return -1;
@@ -191,16 +188,15 @@ int my_mount(char *dev, char *location, char *fs, int force_rw)
if (!strcmp(fs, "reiserfs"))
my_insmod("reiserfs", ANY_DRIVER_TYPE, NULL);
+#endif
if (!strcmp(fs, "iso9660"))
my_insmod("isofs", ANY_DRIVER_TYPE, NULL);
-#endif
#ifndef DISABLE_NETWORK
if (!strcmp(fs, "nfs")) {
- int flags = MS_RDONLY;
my_insmod("nfs", ANY_DRIVER_TYPE, NULL);
log_message("preparing nfsmount for %s", dev);
- rc = nfsmount_prepare(dev, &flags, &opts);
+ rc = nfsmount_prepare(dev, &opts);
if (rc != 0)
return rc;
}