diff options
Diffstat (limited to 'loader2')
| -rw-r--r-- | loader2/loader.c | 2 | ||||
| -rw-r--r-- | loader2/loader.h | 1 | ||||
| -rw-r--r-- | loader2/nfsinstall.c | 10 |
3 files changed, 2 insertions, 11 deletions
diff --git a/loader2/loader.c b/loader2/loader.c index e500d66c9..610c29e24 100644 --- a/loader2/loader.c +++ b/loader2/loader.c @@ -677,8 +677,6 @@ static int parseCmdLineFlags(int flags, struct loaderData_s * loaderData, flags &= ~LOADER_FLAGS_SELINUX; else if (!strncasecmp(argv[i], "selinux", 7)) flags |= LOADER_FLAGS_SELINUX; - else if (!strncasecmp(argv[i], "nfsmountopts=", 13)) - loaderData->nfsmountopts = strdup(argv[i] + 13); else if (numExtraArgs < (MAX_EXTRA_ARGS - 1)) { /* go through and append args we just want to pass on to */ /* the anaconda script, but don't want to represent as a */ diff --git a/loader2/loader.h b/loader2/loader.h index 29a018259..f58ccab40 100644 --- a/loader2/loader.h +++ b/loader2/loader.h @@ -107,7 +107,6 @@ struct loaderData_s { void * methodData; char * logLevel; char * updatessrc; - char * nfsmountopts; moduleList modLoaded; moduleDeps * modDepsPtr; diff --git a/loader2/nfsinstall.c b/loader2/nfsinstall.c index 08ac3ab17..03ea6ea82 100644 --- a/loader2/nfsinstall.c +++ b/loader2/nfsinstall.c @@ -120,7 +120,6 @@ char * mountNfsImage(struct installMethod * method, int foundinvalid = 0; char * buf; struct in_addr ip; - char * nfsMountOpts = NULL; if (loaderData->noDns && !(inet_aton(host, &ip))) { newtWinMessage(_("Error"), _("OK"), @@ -135,12 +134,7 @@ char * mountNfsImage(struct installMethod * method, fullPath = alloca(strlen(host) + strlen(directory) + 2); sprintf(fullPath, "%s:%s", host, directory); - if (loaderData->nfsmountopts && *loaderData->nfsmountopts) { - nfsMountOpts = strdup(loaderData->nfsmountopts); - logMessage("mounting nfs path %s with options %s", fullPath, nfsMountOpts); - } else { - logMessage(INFO, "mounting nfs path %s", fullPath); - } + logMessage(INFO, "mounting nfs path %s", fullPath); if (FL_TESTING(flags)) { stage = NFS_STAGE_DONE; @@ -151,7 +145,7 @@ char * mountNfsImage(struct installMethod * method, stage = NFS_STAGE_NFS; if (!doPwMount(fullPath, "/mnt/source", "nfs", - IMOUNT_RDONLY, nfsMountOpts)) { + IMOUNT_RDONLY, NULL)) { char mntPath[1024]; snprintf(mntPath, sizeof(mntPath), "/mnt/source/%s/base/stage2.img", getProductPath()); |