summaryrefslogtreecommitdiffstats
path: root/loader2/driverdisk.c
diff options
context:
space:
mode:
authorJeremy Katz <katzj@redhat.com>2003-11-03 03:10:27 +0000
committerJeremy Katz <katzj@redhat.com>2003-11-03 03:10:27 +0000
commitb8fd54a06491bb811954172ff8078a4ab67dfce9 (patch)
tree396a7eb8db59ca8ff6eb3ebfd86be8d1b770e6d1 /loader2/driverdisk.c
parent5ae84f0bc167bfd8a1ef6f0b957e80c773f2e85d (diff)
downloadanaconda-b8fd54a06491bb811954172ff8078a4ab67dfce9.tar.gz
anaconda-b8fd54a06491bb811954172ff8078a4ab67dfce9.tar.xz
anaconda-b8fd54a06491bb811954172ff8078a4ab67dfce9.zip
handle passing explicitly the fstype for a driver disk correctly (#106425,
from Nate Faerber <nfaerber@penguincomputing.com>)
Diffstat (limited to 'loader2/driverdisk.c')
-rw-r--r--loader2/driverdisk.c6
1 files changed, 2 insertions, 4 deletions
diff --git a/loader2/driverdisk.c b/loader2/driverdisk.c
index 100c77502..4a236ba93 100644
--- a/loader2/driverdisk.c
+++ b/loader2/driverdisk.c
@@ -521,14 +521,12 @@ static void getDDFromDev(struct knownDevices * kd,
char * fstype, int flags) {
devMakeInode(dev, "/tmp/dddev");
if (fstype) {
- if (!doPwMount("/tmp/dddev", "/tmp/drivers", fstype, 1, 0,
+ if (doPwMount("/tmp/dddev", "/tmp/drivers", fstype, 1, 0,
NULL, NULL, 0, 0)) {
logMessage("unable to mount %s as %s", dev, fstype);
return;
}
- }
-
- if (doPwMount("/tmp/dddev", "/tmp/drivers", "vfat", 1, 0, NULL, NULL, 0, 0)) {
+ } else if (doPwMount("/tmp/dddev", "/tmp/drivers", "vfat", 1, 0, NULL, NULL, 0, 0)) {
if (doPwMount("/tmp/dddev", "/tmp/drivers", "ext2", 1, 0, NULL, NULL, 0, 0)) {
if (doPwMount("/tmp/dddev", "/tmp/drivers", "iso9660", 1, 0, NULL, NULL, 0, 0)) {
logMessage("unable to mount driver disk %s", dev);