summaryrefslogtreecommitdiffstats
path: root/loader/loader.c
diff options
context:
space:
mode:
authorJeremy Katz <katzj@redhat.com>2002-03-05 21:51:03 +0000
committerJeremy Katz <katzj@redhat.com>2002-03-05 21:51:03 +0000
commit634423e64966015f5c13d96c490b36eb1c3db42a (patch)
tree0e9bff0de2b5f0ac28bceee5440f2ecde608ce41 /loader/loader.c
parent1544c192d01050dea6dc5a805c349ece2d06b391 (diff)
downloadanaconda-634423e64966015f5c13d96c490b36eb1c3db42a.tar.gz
anaconda-634423e64966015f5c13d96c490b36eb1c3db42a.tar.xz
anaconda-634423e64966015f5c13d96c490b36eb1c3db42a.zip
merge to HEAD
Diffstat (limited to 'loader/loader.c')
-rw-r--r--loader/loader.c7
1 files changed, 4 insertions, 3 deletions
diff --git a/loader/loader.c b/loader/loader.c
index 4737ae0be..adbc73bba 100644
--- a/loader/loader.c
+++ b/loader/loader.c
@@ -2625,9 +2625,9 @@ int kickstartFromHardDrive(char * location,
return 1;
}
- if (doPwMount("/tmp/hddevice", "/mnt/hddrive", "ext2", 0, 0,
+ if (doPwMount("/tmp/hddevice", "/mnt/hddrive", "ext2", 1, 0,
NULL, NULL) &&
- doPwMount("/tmp/hddevice", "/mnt/hddrive", "vfat", 0, 0,
+ doPwMount("/tmp/hddevice", "/mnt/hddrive", "vfat", 1, 0,
NULL, NULL)) {
logMessage("failed to mount %s", device);
}
@@ -2646,7 +2646,8 @@ int kickstartFromFloppy(char * location, moduleList modLoaded,
if (devMakeInode(floppyDevice, "/tmp/floppy"))
return 1;
- if (doPwMount("/tmp/floppy", "/tmp/ks", "vfat", 1, 0, NULL, NULL)) {
+ if ((doPwMount("/tmp/floppy", "/tmp/ks", "vfat", 1, 0, NULL, NULL)) &&
+ doPwMount("/tmp/floppy", "/tmp/ks", "ext2", 1, 0, NULL, NULL)) {
logMessage("failed to mount floppy: %s", strerror(errno));
return 1;
}