diff options
| author | Erik Troan <ewt@redhat.com> | 2000-08-16 13:00:07 +0000 |
|---|---|---|
| committer | Erik Troan <ewt@redhat.com> | 2000-08-16 13:00:07 +0000 |
| commit | be4caf0e252b211d463928e5fa70b3c0979d2b2a (patch) | |
| tree | 5897b1d3a7c6974bd93022dcc00352d7edaf257a | |
| parent | 0acdd314b24df50324a5b0dc92a122d1f600777d (diff) | |
| download | anaconda-be4caf0e252b211d463928e5fa70b3c0979d2b2a.tar.gz anaconda-be4caf0e252b211d463928e5fa70b3c0979d2b2a.tar.xz anaconda-be4caf0e252b211d463928e5fa70b3c0979d2b2a.zip | |
use /./ for url installs rather then //
| -rw-r--r-- | loader/loader.c | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/loader/loader.c b/loader/loader.c index 8f5f68b2b..d62aa41c0 100644 --- a/loader/loader.c +++ b/loader/loader.c @@ -1158,6 +1158,7 @@ static char * mountUrlImage(struct installMethod * method, static struct networkDeviceConfig netDev; char * url; char * login; + char * finalPrefix; enum urlprotocol_t proto = !strcmp(method->name, "FTP") ? URL_METHOD_FTP : URL_METHOD_HTTP; @@ -1240,10 +1241,15 @@ static char * mountUrlImage(struct installMethod * method, } } - url = malloc(strlen(ui.prefix) + 25 + strlen(ui.address) + strlen(login)); + if (!strcmp(ui.prefix, "/")) + finalPrefix = "/."; + else + finalPrefix = ui.prefix; + + url = malloc(strlen(finalPrefix) + 25 + strlen(ui.address) + strlen(login)); sprintf(url, "%s://%s%s/%s", ui.protocol == URL_METHOD_FTP ? "ftp" : "http", - login, ui.address, ui.prefix); + login, ui.address, finalPrefix); writeNetInfo("/tmp/netinfo", &netDev, kd); @@ -2270,7 +2276,7 @@ static int usbInitialize(moduleList modLoaded, moduleDeps modDeps, static void usbInitializeMouse(moduleList modLoaded, moduleDeps modDeps, moduleInfoSet modInfo, int flags) { - if (FL_NOUSB(flags)) return 0; + if (FL_NOUSB(flags)) return; logMessage("looking for USB mouse..."); if (probeDevices(CLASS_MOUSE, BUS_USB, PROBE_ALL)) { |