summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--loader2/loader.c42
-rw-r--r--loader2/method.h4
-rw-r--r--loader2/modules.c1
-rw-r--r--loader2/net.c2
-rw-r--r--loader2/nfsinstall.c1
-rw-r--r--loader2/urls.c38
6 files changed, 6 insertions, 82 deletions
diff --git a/loader2/loader.c b/loader2/loader.c
index b38005629..9f84774fb 100644
--- a/loader2/loader.c
+++ b/loader2/loader.c
@@ -545,7 +545,6 @@ static int parseCmdLineFlags(int flags, struct loaderData_s * loaderData,
}
} else if (!strncasecmp(argv[i], "ip=", 3)) {
loaderData->ip = strdup(argv[i] + 3);
- /* JKFIXME: ??? */
loaderData->ipinfo_set = 1;
} else if (!strncasecmp(argv[i], "netmask=", 8))
loaderData->netmask = strdup(argv[i] + 8);
@@ -788,7 +787,6 @@ static char *doLoaderMain(char * location,
case STEP_DRIVER: {
int found = 0;
- /* JKFIXME: this is the nifty cool new step */
for (i = 0; i < kd->numKnown; i++) {
if (installMethods[validMethods[methodNum]].deviceType ==
kd->known[i].class)
@@ -841,7 +839,6 @@ static char *doLoaderMain(char * location,
int main(int argc, char ** argv) {
int flags = 0;
- int haveKon = 0; /* JKFIXME: this should be conditionalized... */
struct stat sb;
int rc, i;
char * arg;
@@ -965,8 +962,6 @@ int main(int argc, char ** argv) {
/* now let's initialize any possible firewire. fun */
firewireInitialize(modLoaded, modDeps, modInfo, flags);
- /* JKFIXME: this is where we used to setFloppyDevice and do KS_FLOPPY */
-
/* JKFIXME: this is kind of a different way to handle pcmcia... I think
* it's more correct, although it will require a little bit of kudzu
* hacking */
@@ -1014,10 +1009,6 @@ int main(int argc, char ** argv) {
unlink("/lib64");
symlink("/mnt/runtime/lib64", "/lib64");
}
-
- /* JKFIXME: need to pull in the second stage modules and use
- * them to update module-info, pcitable, etc just like with
- * driver disks */
}
logMessage("getting ready to spawn shell now");
@@ -1115,21 +1106,6 @@ int main(int argc, char ** argv) {
}
if (FL_RESCUE(flags)) {
- startNewt(flags);
-
- /* JKFIXME: this seems broken... we should just ask these questions
- * earlier for rescue mode and do the fast path check later */
-#if 0
- if (!lang) {
- int rc;
-
- do {
- chooseLanguage(&lang, flags);
- defaultLang = 0;
- rc = chooseKeyboard (&keymap, &kbdtype, flags);
- } while ((rc) && (rc != LOADER_NOOP));
- }
-#endif
*argptr++ = "--rescue";
} else {
if (FL_SERIAL(flags))
@@ -1138,29 +1114,21 @@ int main(int argc, char ** argv) {
*argptr++ = "-T";
if (FL_EXPERT(flags))
*argptr++ = "--expert";
-
+
if (FL_KICKSTART(flags)) {
*argptr++ = "--kickstart";
*argptr++ = loaderData.ksFile;
}
- if (loaderData.lang && (loaderData.lang_set == 1) &&
- !FL_NOPASS(flags)) {
+ if ((loaderData.lang) && !FL_NOPASS(flags)) {
*argptr++ = "--lang";
*argptr++ = loaderData.lang;
}
-
-#if 0
- if (keymap && !FL_NOPASS(flags)) {
- *argptr++ = "--keymap";
- *argptr++ = keymap;
- }
- if (kbdtype && !FL_NOPASS(flags)) {
- *argptr++ = "--kbdtype";
- *argptr++ = kbdtype;
+ if ((loaderData.kbd) && !FL_NOPASS(flags)) {
+ *argptr++ = "--keymap";
+ *argptr++ = loaderData.kbd;
}
-#endif
for (i = 0; i < modLoaded->numModules; i++) {
struct moduleInfo * mi;
diff --git a/loader2/method.h b/loader2/method.h
index 99717255e..df6ccb235 100644
--- a/loader2/method.h
+++ b/loader2/method.h
@@ -37,8 +37,4 @@ void copyUpdatesImg(char * path);
int copyDirectory(char * from, char * to);
-/* JKFIXME: move these to specific include files*/
-
-
-
#endif
diff --git a/loader2/modules.c b/loader2/modules.c
index a29ecbf3c..7ae4b5373 100644
--- a/loader2/modules.c
+++ b/loader2/modules.c
@@ -428,7 +428,6 @@ static int doLoadModules(const char * origModNames, moduleList modLoaded,
if (!location && modLocation)
location = modLocation;
- /* JKFIXME: do something to extract the modules */
paths = extractModules(list, paths, location);
i = 0;
diff --git a/loader2/net.c b/loader2/net.c
index ff27f3f4f..a00d6c3ed 100644
--- a/loader2/net.c
+++ b/loader2/net.c
@@ -746,7 +746,7 @@ int kickstartNetworkUp(struct knownDevices * kd,
rc = chooseNetworkInterface(kd, loaderData, flags);
if (rc == LOADER_ERROR) {
- /* JKFIXME: ask for a driver disk */
+ /* JKFIXME: ask for a driver disk? */
logMessage("no network drivers for doing kickstart");
return -1;
} else if (rc == LOADER_BACK) {
diff --git a/loader2/nfsinstall.c b/loader2/nfsinstall.c
index e46fbe02c..5caffdd40 100644
--- a/loader2/nfsinstall.c
+++ b/loader2/nfsinstall.c
@@ -124,7 +124,6 @@ char * mountNfsImage(struct installMethod * method,
case NFS_STAGE_NFS:
logMessage("going to do nfsGetSetup");
- /* JKFIXME: this is a hack to get kickstart up quicker */
if (loaderData->method &&
!strncmp(loaderData->method, "nfs", 3) &&
loaderData->methodData) {
diff --git a/loader2/urls.c b/loader2/urls.c
index 3cc2a889b..c5d1de2fe 100644
--- a/loader2/urls.c
+++ b/loader2/urls.c
@@ -204,44 +204,6 @@ int urlinstFinishTransfer(struct iurlinfo * ui, int fd) {
return 0;
}
-/* JKFIXME: this must go away / be generalized to be like all other platform */
-#if defined (__s390__) || defined (__s390x__)
-int setupRemote(struct iurlinfo * ui) {
- char *env, *d;
-
- if (!(env = getenv("RPMSERVER"))) {
- ui->address = "";
- ui->prefix = "";
- return 0;
- }
-
- if (!strncmp(env, "ftp://",6))
- env += 6;
- else if (!strncmp(env, "http://",7))
- env += 7;
-
- if (!(d = index (env, '/'))) {
- d = "";
- ui->prefix = strdup(d);
- }
- else /* make sure the path either starts with a / or a ~ */
- if(*d != '/') {
- ui->prefix = (char *)malloc(strlen(d)+2);
- *ui->prefix = '/';
- strcat(ui->prefix, d);
- }
- else ui->prefix = strdup(d);
-
- ui->address = strdup(env);
- if (ui->address && (d = index (ui->address, '/')))
- *d = '\0';
- if (ui->address && (d = index (ui->address, ':')))
- *d = '\0';
-
- return 0;
-}
-#endif /* #if defined (__s390__) || defined (__s390x__) */
-
char * addrToIp(char * hostname) {
struct in_addr ad;
char * chptr;
generated by cgit (git 2.34.1) at 2024-10-06 05:43:45 +0000