summaryrefslogtreecommitdiffstats
path: root/loader2/loader.c
diff options
context:
space:
mode:
authorJeremy Katz <katzj@redhat.com>2005-09-15 22:12:39 +0000
committerJeremy Katz <katzj@redhat.com>2005-09-15 22:12:39 +0000
commitaccc49c458eb7c7dc3660cbe65b3b34b340dfeef (patch)
tree4e1c594ecb74d73307820dccf1ac5bf29304456c /loader2/loader.c
parent5e1e9a0619de4c5103a99379312fb71eb7de3a63 (diff)
downloadanaconda-accc49c458eb7c7dc3660cbe65b3b34b340dfeef.tar.gz
anaconda-accc49c458eb7c7dc3660cbe65b3b34b340dfeef.tar.xz
anaconda-accc49c458eb7c7dc3660cbe65b3b34b340dfeef.zip
2005-09-15 Jeremy Katz <katzj@redhat.com>
* isys/imount.c (doPwMount): Make arguments for doPwMount simpler. Use a bitmask of flags and pass extra data like mount(2). Use flags for nfs and pass arguments onto nfsmount(). Kill some dead code. * isys/imount.c (doPwMount): Update prototype, add constants. * isys/isys.c (doMount): Update for new API. * loader2/cdinstall.c: Likewise. * loader2/driverdisk.c: Likewise. * loader2/hdinstall.c: Likewise. * loader2/loader.c: Likewise. * loader2/method.c: Likewise. * loader2/nfsinstall.c: Likewise. * loader2/usb.c: Likewise.
Diffstat (limited to 'loader2/loader.c')
-rw-r--r--loader2/loader.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/loader2/loader.c b/loader2/loader.c
index 5177c5fe1..c59f9d96f 100644
--- a/loader2/loader.c
+++ b/loader2/loader.c
@@ -119,7 +119,7 @@ struct moduleBallLocation * secondStageModuleLocation;
void setupRamfs(void) {
mkdirChain("/tmp/ramfs");
- doPwMount("none", "/tmp/ramfs", "ramfs", 0, 0, NULL, NULL, 0, 0);
+ doPwMount("none", "/tmp/ramfs", "ramfs", 0, NULL);
}
@@ -325,10 +325,10 @@ void loadUpdates(int flags) {
logMessage(INFO, "UPDATES device is %s", device);
devMakeInode(device, "/tmp/upd.disk");
- if (doPwMount("/tmp/upd.disk", "/tmp/update-disk", "ext2", 1, 0,
- NULL, NULL, 0, 0) &&
- doPwMount("/tmp/upd.disk", "/tmp/update-disk", "iso9660", 1, 0,
- NULL, NULL, 0, 0)) {
+ if (doPwMount("/tmp/upd.disk", "/tmp/update-disk", "ext2",
+ IMOUNT_RDONLY, NULL) &&
+ doPwMount("/tmp/upd.disk", "/tmp/update-disk", "iso9660",
+ IMOUNT_RDONLY, NULL)) {
newtWinMessage(_("Error"), _("OK"),
_("Failed to mount updates disk"));
} else {