summaryrefslogtreecommitdiffstats
path: root/mdk-stage1/mount.c
diff options
context:
space:
mode:
authorGuillaume Cottenceau <gc@mandriva.com>2000-12-14 23:47:36 +0000
committerGuillaume Cottenceau <gc@mandriva.com>2000-12-14 23:47:36 +0000
commit752c59eb0ab37ca75bb410052aaf40514818cd54 (patch)
treef083ed8b39dedee72a7eadaa4f7631f6b11fc0e7 /mdk-stage1/mount.c
parent4cfd9a056d6e652efb751a6a2ea56c700886ce51 (diff)
downloaddrakx-752c59eb0ab37ca75bb410052aaf40514818cd54.tar
drakx-752c59eb0ab37ca75bb410052aaf40514818cd54.tar.gz
drakx-752c59eb0ab37ca75bb410052aaf40514818cd54.tar.bz2
drakx-752c59eb0ab37ca75bb410052aaf40514818cd54.tar.xz
drakx-752c59eb0ab37ca75bb410052aaf40514818cd54.zip
- do progressbar since it seems nobody can live without it
- write real separation between cdrom, disk, and network code; have multiple targets for that issue - begin network code: network interface is up and runing (static IP only), network is configured
Diffstat (limited to 'mdk-stage1/mount.c')
-rw-r--r--mdk-stage1/mount.c6
1 files changed, 6 insertions, 0 deletions
diff --git a/mdk-stage1/mount.c b/mdk-stage1/mount.c
index 6de11b480..15533e716 100644
--- a/mdk-stage1/mount.c
+++ b/mdk-stage1/mount.c
@@ -31,6 +31,7 @@
#include "mount.h"
+#ifndef DISABLE_MEDIAS
/* WARNING: this won't work if the argument is not /dev/ based */
static int ensure_dev_exists(char *dev)
{
@@ -93,6 +94,7 @@ static int ensure_dev_exists(char *dev)
return 0;
}
+#endif /* DISABLE_MEDIAS */
/* mounts, creating the device if needed+possible */
@@ -103,12 +105,14 @@ int my_mount(char *dev, char *location, char *fs)
struct stat buf;
int rc;
+#ifndef DISABLE_MEDIAS
rc = ensure_dev_exists(dev);
if (rc != 0) {
log_message("could not create required device file");
return -1;
}
+#endif
log_message("mounting %s on %s as type %s", dev, location, fs);
@@ -131,6 +135,7 @@ int my_mount(char *dev, char *location, char *fs)
flags = MS_MGC_VAL;
+#ifndef DISABLE_MEDIAS
if (!strcmp(fs, "vfat")) {
my_insmod("vfat");
opts = "check=relaxed";
@@ -140,6 +145,7 @@ int my_mount(char *dev, char *location, char *fs)
my_insmod("isofs");
flags |= MS_RDONLY;
}
+#endif
rc = mount(dev, location, fs, flags, opts);