diff options
| author | Chris Lumens <clumens@redhat.com> | 2008-01-22 16:50:08 -0500 |
|---|---|---|
| committer | Chris Lumens <clumens@redhat.com> | 2008-02-11 10:44:54 -0500 |
| commit | cc92e5a32bb9ac4e11a965e276e9535fb76a4371 (patch) | |
| tree | e4d8eb9a64f1e7533aa3d2b71b497c8078a825da /loader2/driverdisk.c | |
| parent | b97a8e70331e71559e08a684195904c5cb824408 (diff) | |
Use the mount program instead of our own code.
Also change isys's mount function to take its arguments as a string like
would be passed to the mount program, instead of a handful of flags.
Diffstat (limited to 'loader2/driverdisk.c')
| -rw-r--r-- | loader2/driverdisk.c | 21 |
1 files changed, 10 insertions, 11 deletions
diff --git a/loader2/driverdisk.c b/loader2/driverdisk.c index 1ef83e3ca..9672e59d9 100644 --- a/loader2/driverdisk.c +++ b/loader2/driverdisk.c @@ -293,9 +293,9 @@ int loadDriverFromMedia(int class, struct loaderData_s *loaderData, } logMessage(INFO, "trying to mount %s as partition", part); - if (doPwMount(part, "/tmp/dpart", "vfat", IMOUNT_RDONLY, NULL)) { - if (doPwMount(part, "/tmp/dpart", "ext2", IMOUNT_RDONLY, NULL)) { - if (doPwMount(part, "/tmp/dpart", "iso9660", IMOUNT_RDONLY, NULL)) { + if (doPwMount(part, "/tmp/dpart", "vfat", "ro")) { + if (doPwMount(part, "/tmp/dpart", "ext2", "ro")) { + if (doPwMount(part, "/tmp/dpart", "iso9660", "ro")) { newtWinMessage(_("Error"), _("OK"), _("Failed to mount partition.")); stage = DEV_PART; @@ -359,9 +359,9 @@ int loadDriverFromMedia(int class, struct loaderData_s *loaderData, dir = 1; logMessage(INFO, "trying to mount %s", device); - if (doPwMount(device, "/tmp/drivers", "vfat", IMOUNT_RDONLY, NULL)) { - if (doPwMount(device, "/tmp/drivers", "ext2", IMOUNT_RDONLY, NULL)) { - if (doPwMount(device, "/tmp/drivers", "iso9660", IMOUNT_RDONLY, NULL)) { + if (doPwMount(device, "/tmp/drivers", "vfat", "ro")) { + if (doPwMount(device, "/tmp/drivers", "ext2", "ro")) { + if (doPwMount(device, "/tmp/drivers", "iso9660", "ro")) { newtWinMessage(_("Error"), _("OK"), _("Failed to mount driver disk.")); stage = DEV_INSERT; @@ -611,14 +611,13 @@ void useKickstartDD(struct loaderData_s * loaderData, static void getDDFromDev(struct loaderData_s * loaderData, char * dev, char * fstype) { if (fstype) { - if (doPwMount(dev, "/tmp/drivers", fstype, - IMOUNT_RDONLY, NULL)) { + if (doPwMount(dev, "/tmp/drivers", fstype, "ro")) { logMessage(ERROR, "unable to mount %s as %s", dev, fstype); return; } - } else if (doPwMount(dev, "/tmp/drivers", "vfat", IMOUNT_RDONLY, NULL)) { - if (doPwMount(dev, "/tmp/drivers", "ext2", IMOUNT_RDONLY, NULL)) { - if (doPwMount(dev, "/tmp/drivers", "iso9660", IMOUNT_RDONLY, NULL)) { + } else if (doPwMount(dev, "/tmp/drivers", "vfat", "ro")) { + if (doPwMount(dev, "/tmp/drivers", "ext2", "ro")) { + if (doPwMount(dev, "/tmp/drivers", "iso9660", "ro")) { logMessage(ERROR, "unable to mount driver disk %s", dev); return; } |