diff options
| author | Chris Lumens <clumens@redhat.com> | 2008-07-23 15:49:58 -0400 |
|---|---|---|
| committer | Chris Lumens <clumens@redhat.com> | 2008-07-23 15:49:58 -0400 |
| commit | 01a488111e60d8048cdb5afba6c83bb6b9f57e53 (patch) | |
| tree | 1759041603f69743dbec21709372a4d9513ea7ff /loader2 | |
| parent | ecac999ecf37d0f8fde438f385e2caca9ed74cdb (diff) | |
| download | anaconda-01a488111e60d8048cdb5afba6c83bb6b9f57e53.tar.gz anaconda-01a488111e60d8048cdb5afba6c83bb6b9f57e53.tar.xz anaconda-01a488111e60d8048cdb5afba6c83bb6b9f57e53.zip | |
Compile fixes.
Diffstat (limited to 'loader2')
| -rw-r--r-- | loader2/net.c | 2 | ||||
| -rw-r--r-- | loader2/nfsinstall.c | 8 |
2 files changed, 6 insertions, 4 deletions
diff --git a/loader2/net.c b/loader2/net.c index 6f95c2f95..1659f6047 100644 --- a/loader2/net.c +++ b/loader2/net.c @@ -1852,7 +1852,7 @@ int chooseNetworkInterface(struct loaderData_s * loaderData) { char **deviceNames; char *ksMacAddr = NULL, *seconds = strdup("10"), *idstr = NULL; struct device **devs; - struct newtWinEntry entry[] = {{_("Seconds:"), (const char **) &seconds, 0}, + struct newtWinEntry entry[] = {{N_("Seconds:"), (char **) &seconds, 0}, {NULL, NULL, 0 }}; devs = getDevices(DEVICE_NETWORK); diff --git a/loader2/nfsinstall.c b/loader2/nfsinstall.c index 7f5463fcd..b368856be 100644 --- a/loader2/nfsinstall.c +++ b/loader2/nfsinstall.c @@ -30,6 +30,7 @@ #include <string.h> #include <unistd.h> #include <errno.h> +#include <string.h> #include "copy.h" #include "loader.h" @@ -302,6 +303,7 @@ char * mountNfsImage(struct installMethod * method, void setKickstartNfs(struct loaderData_s * loaderData, int argc, char ** argv) { char * host = NULL, * dir = NULL, * mountOpts = NULL; + char *substr = NULL; poptContext optCon; int rc; struct poptOption ksNfsOptions[] = { @@ -332,8 +334,8 @@ void setKickstartNfs(struct loaderData_s * loaderData, int argc, substr = strstr(dir, ".img"); if (!substr || (substr && *(substr+4) != '\0')) { - if (opts) { - if (asprintf(&(loaderData->instRepo), "nfs:%s:%s:%s", host, dir, opts)) { + if (mountOpts) { + if (asprintf(&(loaderData->instRepo), "nfs:%s:%s:%s", host, dir, mountOpts)) { logMessage(CRITICAL, "%s: %d: %m", __func__, __LINE__); abort(); } @@ -345,7 +347,7 @@ void setKickstartNfs(struct loaderData_s * loaderData, int argc, } logMessage(INFO, "results of nfs, host is %s, dir is %s, opts are '%s'", - host, dir); + host, dir, mountOpts); } else { loaderData->stage2Data = calloc(sizeof(struct nfsInstallData *), 1); ((struct nfsInstallData *)loaderData->stage2Data)->host = host; |