Anaconda can perfectly well parse the nfsptions:server:dir format, see
iutil.pyarseNfsUrl().

Resolves: rhbz#688757
---
loader/nfsinstall.c | 3 ++-
1 files changed, 2 insertions(+), 1 deletions(-)

diff --git a/loader/nfsinstall.c b/loader/nfsinstall.c
index 73dedcd..685062b 100644
--- a/loader/nfsinstall.c
+++ b/loader/nfsinstall.c
@@ -401,7 +401,8 @@ void setKickstartNfs(struct loaderData_s * loaderData, int argc,

substr = strstr(dir, ".img");
if (!substr || (substr && *(substr+4) != '')) {
- checked_asprintf(&(loaderData->instRepo), "nfs:%s:%s", host, dir);
+ checked_asprintf(&(loaderData->instRepo), "nfs:%s:%s:%s",
+ mountOpts, host, dir);

logMessage(INFO, "results of nfs, host is %s, dir is %s, opts are '%s'",
host, dir, mountOpts);
--
1.7.3.3

_______________________________________________
Anaconda-devel-list mailing list
Anaconda-devel-list@redhat.com
https://www.redhat.com/mailman/listinfo/anaconda-devel-list

Anaconda can perfectly well parse the nfsptions:server:dir format, see
iutil.pyarseNfsUrl().
---
loader/nfsinstall.c | 8 +++++++-
1 files changed, 7 insertions(+), 1 deletions(-)

diff --git a/loader/nfsinstall.c b/loader/nfsinstall.c
index 73dedcd..c3019ce 100644
--- a/loader/nfsinstall.c
+++ b/loader/nfsinstall.c
@@ -401,7 +401,13 @@ void setKickstartNfs(struct loaderData_s * loaderData, int argc,

substr = strstr(dir, ".img");
if (!substr || (substr && *(substr+4) != '')) {
- checked_asprintf(&(loaderData->instRepo), "nfs:%s:%s", host, dir);
+ if (mountOpts) {
+ checked_asprintf(&(loaderData->instRepo), "nfs:%s:%s:%s",
+ mountOpts, host, dir);
+ } else {
+ checked_asprintf(&(loaderData->instRepo), "nfs:%s:%s",
+ host, dir);
+ }

logMessage(INFO, "results of nfs, host is %s, dir is %s, opts are '%s'",
host, dir, mountOpts);
--
1.7.3.3

_______________________________________________
Anaconda-devel-list mailing list
Anaconda-devel-list@redhat.com
https://www.redhat.com/mailman/listinfo/anaconda-devel-list

> diff --git a/loader/nfsinstall.c b/loader/nfsinstall.c
> index 73dedcd..c3019ce 100644
> --- a/loader/nfsinstall.c
> +++ b/loader/nfsinstall.c
> @@ -401,7 +401,13 @@ void setKickstartNfs(struct loaderData_s * loaderData, int argc,
>
> substr = strstr(dir, ".img");
> if (!substr || (substr && *(substr+4) != '')) {
> - checked_asprintf(&(loaderData->instRepo), "nfs:%s:%s", host, dir);
> + if (mountOpts) {
> + checked_asprintf(&(loaderData->instRepo), "nfs:%s:%s:%s",
> + mountOpts, host, dir);
> + } else {
> + checked_asprintf(&(loaderData->instRepo), "nfs:%s:%s",
> + host, dir);
> + }
>
> logMessage(INFO, "results of nfs, host is %s, dir is %s, opts are '%s'",
> host, dir, mountOpts);

Looks good, thanks.

- Chris

_______________________________________________
Anaconda-devel-list mailing list
Anaconda-devel-list@redhat.com
https://www.redhat.com/mailman/listinfo/anaconda-devel-list