summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--loader2/cdinstall.c4
-rw-r--r--loader2/driverdisk.c14
-rw-r--r--loader2/hdinstall.c2
-rw-r--r--loader2/kickstart.c6
-rw-r--r--loader2/loader.c8
-rw-r--r--loader2/method.c8
-rw-r--r--loader2/nfsinstall.c4
-rw-r--r--loader2/usb.c2
8 files changed, 24 insertions, 24 deletions
diff --git a/loader2/cdinstall.c b/loader2/cdinstall.c
index e3734cd3f..3d633c000 100644
--- a/loader2/cdinstall.c
+++ b/loader2/cdinstall.c
@@ -151,7 +151,7 @@ static void mountCdromStage2(char *cddev) {
do {
do {
if (doPwMount("/tmp/cdrom", "/mnt/source",
- "iso9660", 1, 0, NULL, NULL, 0)) {
+ "iso9660", 1, 0, NULL, NULL, 0, 0)) {
ejectCdrom();
wrongCDMessage();
} else {
@@ -313,7 +313,7 @@ char * setupCdrom(char * location,
logMessage("trying to mount device %s", kd->known[i].name);
devMakeInode(kd->known[i].name, "/tmp/cdrom");
if (!doPwMount("/tmp/cdrom", "/mnt/source", "iso9660", 1, 0,
- NULL, NULL, 0)) {
+ NULL, NULL, 0, 0)) {
if (!access("/mnt/source/RedHat/base/stage2.img", R_OK) &&
(!requirepkgs || !access("/mnt/source/.discinfo", R_OK))) {
rc = mountStage2("/mnt/source/RedHat/base/stage2.img");
diff --git a/loader2/driverdisk.c b/loader2/driverdisk.c
index 8b2442be5..73a5ca2d4 100644
--- a/loader2/driverdisk.c
+++ b/loader2/driverdisk.c
@@ -234,9 +234,9 @@ int loadDriverFromMedia(int class, moduleList modLoaded,
devMakeInode(device, "/tmp/dddev");
logMessage("trying to mount %s", device);
- if (doPwMount("/tmp/dddev", "/tmp/drivers", "vfat", 1, 0, NULL, NULL, 0)) {
- if (doPwMount("/tmp/dddev", "/tmp/drivers", "ext2", 1, 0, NULL, NULL, 0)) {
- if (doPwMount("/tmp/dddev", "/tmp/drivers", "iso9660", 1, 0, NULL, NULL, 0)) {
+ 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)) {
newtWinMessage(_("Error"), _("OK"),
_("Failed to mount driver disk."));
stage = DEV_INSERT;
@@ -410,15 +410,15 @@ void useKickstartDD(struct loaderData_s * loaderData, int argc,
devMakeInode(dev, "/tmp/dddev");
if (fstype) {
if (!doPwMount("/tmp/dddev", "/tmp/drivers", fstype, 1, 0,
- NULL, NULL, 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)) {
- if (doPwMount("/tmp/dddev", "/tmp/drivers", "ext2", 1, 0, NULL, NULL, 0)) {
- if (doPwMount("/tmp/dddev", "/tmp/drivers", "iso9660", 1, 0, NULL, NULL, 0)) {
+ 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);
return;
}
diff --git a/loader2/hdinstall.c b/loader2/hdinstall.c
index 170884808..d3c8091ad 100644
--- a/loader2/hdinstall.c
+++ b/loader2/hdinstall.c
@@ -299,7 +299,7 @@ static char * setupIsoImages(char * device, char * dirName, int flags) {
/* XXX try to mount as ext2 and then vfat */
for (type=typetry; *type; type++) {
- if (!doPwMount("/tmp/hddev", "/tmp/hdimage", *type, 1, 0, NULL, NULL, 0))
+ if (!doPwMount("/tmp/hddev", "/tmp/hdimage", *type, 1, 0, NULL, NULL, 0, 0))
break;
}
diff --git a/loader2/kickstart.c b/loader2/kickstart.c
index 47b213d00..8b5971ce2 100644
--- a/loader2/kickstart.c
+++ b/loader2/kickstart.c
@@ -282,9 +282,9 @@ int getKickstartFromBlockDevice(char *device, char *path) {
if (devMakeInode(device, "/tmp/kssrcdev"))
return 1;
- if ((doPwMount("/tmp/kssrcdev", "/tmp/ks", "vfat", 1, 0, NULL, NULL, 0)) &&
- doPwMount("/tmp/kssrcdev", "/tmp/ks", "ext2", 1, 0, NULL, NULL, 0) &&
- doPwMount("/tmp/kssrcdev", "/tmp/ks", "iso9660", 1, 0, NULL, NULL, 0)) {
+ if ((doPwMount("/tmp/kssrcdev", "/tmp/ks", "vfat", 1, 0, NULL, NULL, 0, 0)) &&
+ doPwMount("/tmp/kssrcdev", "/tmp/ks", "ext2", 1, 0, NULL, NULL, 0, 0) &&
+ doPwMount("/tmp/kssrcdev", "/tmp/ks", "iso9660", 1, 0, NULL, NULL, 0, 0)) {
logMessage("failed to mount /dev/%s: %s", device, strerror(errno));
return 2;
}
diff --git a/loader2/loader.c b/loader2/loader.c
index b01b09a56..d4d4dc1f0 100644
--- a/loader2/loader.c
+++ b/loader2/loader.c
@@ -141,7 +141,7 @@ int setupRamdisk(void) {
gunzip_close(f);
}
- if (doPwMount(RAMDISK_DEVICE, "/tmp/ramfs", "ext2", 0, 0, NULL, NULL, 0))
+ if (doPwMount(RAMDISK_DEVICE, "/tmp/ramfs", "ext2", 0, 0, NULL, NULL, 0, 0))
logMessage("failed to mount ramfs image");
return 0;
@@ -150,7 +150,7 @@ int setupRamdisk(void) {
void setupRamfs(void) {
mkdirChain("/tmp/ramfs");
- doPwMount("none", "/tmp/ramfs", "ramfs", 0, 0, NULL, NULL, 0);
+ doPwMount("none", "/tmp/ramfs", "ramfs", 0, 0, NULL, NULL, 0, 0);
}
@@ -319,9 +319,9 @@ void loadUpdates(struct knownDevices *kd, int flags) {
devMakeInode(device, "/tmp/upd.disk");
if (doPwMount("/tmp/upd.disk", "/tmp/update-disk", "ext2", 1, 0,
- NULL, NULL, 0) &&
+ NULL, NULL, 0, 0) &&
doPwMount("/tmp/upd.disk", "/tmp/update-disk", "iso9660", 1, 0,
- NULL, NULL, 0)) {
+ NULL, NULL, 0, 0)) {
newtWinMessage(_("Error"), _("OK"),
_("Failed to mount updates disk"));
} else {
diff --git a/loader2/method.c b/loader2/method.c
index 130d920ca..49639fa4b 100644
--- a/loader2/method.c
+++ b/loader2/method.c
@@ -120,11 +120,11 @@ int mountLoopback(char * fsystem, char * mntpoint, char * device) {
close(loopfd);
if (doPwMount(filename, mntpoint, "iso9660", 1,
- 0, NULL, NULL, 0)) {
+ 0, NULL, NULL, 0, 0)) {
if (doPwMount(filename, mntpoint, "ext2", 1,
- 0, NULL, NULL, 0)) {
+ 0, NULL, NULL, 0, 0)) {
if (doPwMount(filename, mntpoint, "cramfs", 1,
- 0, NULL, NULL, 0)) {
+ 0, NULL, NULL, 0, 0)) {
logMessage("failed to mount loop: %s",
strerror(errno));
ioctl(loopfd, LOOP_CLR_FD, 0);
@@ -199,7 +199,7 @@ int readStampFileFromIso(char *file, char **timestamp, char **releasedescr) {
if (S_ISBLK(sb.st_mode)) {
filetype = 1;
if (doPwMount(file, "/tmp/testmnt",
- "iso9660", 1, 0, NULL, NULL, 0)) {
+ "iso9660", 1, 0, NULL, NULL, 0, 0)) {
logMessage("Failed to mount device %s to get description", file);
return -1;
}
diff --git a/loader2/nfsinstall.c b/loader2/nfsinstall.c
index 6f422ade0..37f7e70e8 100644
--- a/loader2/nfsinstall.c
+++ b/loader2/nfsinstall.c
@@ -170,7 +170,7 @@ char * mountNfsImage(struct installMethod * method,
stage = NFS_STAGE_NFS;
- if (!doPwMount(fullPath, "/mnt/source", "nfs", 1, 0, NULL, NULL, 0)) {
+ if (!doPwMount(fullPath, "/mnt/source", "nfs", 1, 0, NULL, NULL, 0, 0)) {
logMessage("mounted %s on /mnt/source", fullPath);
if (!access("/mnt/source/RedHat/base/stage2.img", R_OK)) {
logMessage("can access stage2.img");
@@ -330,7 +330,7 @@ int kickstartFromNfs(char * url, struct knownDevices * kd,
logMessage("ks location: nfs://%s/%s", host, file);
- if (!doPwMount(host, "/tmp/ks", "nfs", 1, 0, NULL, NULL, 0)) {
+ if (!doPwMount(host, "/tmp/ks", "nfs", 1, 0, NULL, NULL, 0, 0)) {
char * buf;
buf = alloca(strlen(file) + 10);
diff --git a/loader2/usb.c b/loader2/usb.c
index bea93d333..c619a3900 100644
--- a/loader2/usb.c
+++ b/loader2/usb.c
@@ -97,7 +97,7 @@ int usbInitialize(moduleList modLoaded, moduleDeps modDeps,
if (FL_TESTING(flags)) return 0;
if (doPwMount("/proc/bus/usb", "/proc/bus/usb", "usbdevfs", 0, 0,
- NULL, NULL, 0))
+ NULL, NULL, 0, 0))
logMessage("failed to mount device usbdevfs: %s", strerror(errno));
/* sleep so we make sure usb devices get properly enumerated.
generated by cgit (git 2.34.1) at 2024-10-08 23:26:17 +0000