summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDavid Cantrell <dcantrell@redhat.com>2008-10-31 17:03:33 -1000
committerDavid Cantrell <dcantrell@redhat.com>2008-11-03 09:25:19 -1000
commit6320911c4404d217b461aa2f108a67e3f97312c1 (patch)
treedb2ff4c62cabd9e99772a9c242fb69237c692118
parent532865b09fea4b72bde3ccd4bfbc134b70d8a6f2 (diff)
downloadanaconda-6320911c4404d217b461aa2f108a67e3f97312c1.tar.gz
anaconda-6320911c4404d217b461aa2f108a67e3f97312c1.tar.xz
anaconda-6320911c4404d217b461aa2f108a67e3f97312c1.zip
Do not store mount options in loaderData->instRepo (#467760)
Mount options are handled elsewhere, we do not need to store them in the instRepo variable.
-rw-r--r--loader/nfsinstall.c13
1 files changed, 3 insertions, 10 deletions
diff --git a/loader/nfsinstall.c b/loader/nfsinstall.c
index 1e8a530ff..9a61cad69 100644
--- a/loader/nfsinstall.c
+++ b/loader/nfsinstall.c
@@ -345,16 +345,9 @@ void setKickstartNfs(struct loaderData_s * loaderData, int argc,
substr = strstr(dir, ".img");
if (!substr || (substr && *(substr+4) != '\0')) {
- if (mountOpts) {
- if (asprintf(&(loaderData->instRepo), "nfs:%s:%s:%s", host, dir, mountOpts) == -1) {
- logMessage(CRITICAL, "%s: %d: %m", __func__, __LINE__);
- abort();
- }
- } else {
- if (asprintf(&(loaderData->instRepo), "nfs:%s:%s", host, dir) == -1) {
- logMessage(CRITICAL, "%s: %d: %m", __func__, __LINE__);
- abort();
- }
+ if (asprintf(&(loaderData->instRepo), "nfs:%s:%s", host, dir) == -1) {
+ logMessage(CRITICAL, "%s: %d: %m", __func__, __LINE__);
+ abort();
}
logMessage(INFO, "results of nfs, host is %s, dir is %s, opts are '%s'",