diff options
| author | Jeremy Katz <katzj@redhat.com> | 2005-09-15 22:12:39 +0000 |
|---|---|---|
| committer | Jeremy Katz <katzj@redhat.com> | 2005-09-15 22:12:39 +0000 |
| commit | accc49c458eb7c7dc3660cbe65b3b34b340dfeef (patch) | |
| tree | 4e1c594ecb74d73307820dccf1ac5bf29304456c /isys/isys.c | |
| parent | 5e1e9a0619de4c5103a99379312fb71eb7de3a63 (diff) | |
| download | anaconda-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 'isys/isys.c')
| -rw-r--r-- | isys/isys.c | 13 |
1 files changed, 9 insertions, 4 deletions
diff --git a/isys/isys.c b/isys/isys.c index c1aa8e934..ac16705cf 100644 --- a/isys/isys.c +++ b/isys/isys.c @@ -465,14 +465,19 @@ static PyObject * doUMount(PyObject * s, PyObject * args) { static PyObject * doMount(PyObject * s, PyObject * args) { char * fs, * device, * mntpoint; int rc; - int readOnly; - int bindMount; - int reMount; + int readOnly = 0; + int bindMount = 0; + int reMount = 0; + int flags = 0; if (!PyArg_ParseTuple(args, "sssiii", &fs, &device, &mntpoint, &readOnly, &bindMount, &reMount)) return NULL; - rc = doPwMount(device, mntpoint, fs, readOnly, 0, NULL, NULL, bindMount, reMount); + if (readOnly) flags |= IMOUNT_RDONLY; + if (bindMount) flags |= IMOUNT_BIND; + if (reMount) flags |= IMOUNT_REMOUNT; + + rc = doPwMount(device, mntpoint, fs, flags, NULL); if (rc == IMOUNT_ERR_ERRNO) PyErr_SetFromErrno(PyExc_SystemError); else if (rc) |