Re: [PATCH] Do not store mount options in loaderData->instRepo (#467760)

[Hans de Goede <hdegoede@xxxxxxxxxx>]

David Cantrell wrote:
> Mount options are handled elsewhere, we do not need to store them
> in the instRepo variable.

Looks good.

Regards,

Hans


> ---
>  loader/nfsinstall.c |   13 +++----------
>  1 files changed, 3 insertions(+), 10 deletions(-)
>
> diff --git a/loader/nfsinstall.c b/loader/nfsinstall.c
> index 1e8a530..9a61cad 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'",

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