summaryrefslogtreecommitdiffstats
path: root/loader2/loader.c
diff options
context:
space:
mode:
authorJeremy Katz <katzj@redhat.com>2002-12-09 23:09:52 +0000
committerJeremy Katz <katzj@redhat.com>2002-12-09 23:09:52 +0000
commit0923a61ba4a031a2e23128ca6475c3693676d940 (patch)
tree7c935dd1122335a0ac1374cbe7a45abc271c49d6 /loader2/loader.c
parent4026940b2d7ba91ccc934d2dcf3fa6c674586c9a (diff)
downloadanaconda-0923a61ba4a031a2e23128ca6475c3693676d940.tar.gz
anaconda-0923a61ba4a031a2e23128ca6475c3693676d940.tar.xz
anaconda-0923a61ba4a031a2e23128ca6475c3693676d940.zip
merge telnet mode back in
Diffstat (limited to 'loader2/loader.c')
-rw-r--r--loader2/loader.c7
1 files changed, 6 insertions, 1 deletions
diff --git a/loader2/loader.c b/loader2/loader.c
index 1a9857a5f..6e52c3004 100644
--- a/loader2/loader.c
+++ b/loader2/loader.c
@@ -69,6 +69,8 @@
#include "hdinstall.h"
#include "urlinstall.h"
+#include "telnetd.h"
+
#include "../isys/imount.h"
#include "../isys/isys.h"
#include "../isys/probe.h"
@@ -352,6 +354,8 @@ static int parseCmdLineFlags(int flags, struct loaderData_s * loaderData,
flags |= LOADER_FLAGS_NOUSBSTORAGE;
else if (!strcasecmp(argv[i], "nousb"))
flags |= LOADER_FLAGS_NOUSB;
+ else if (!strcasecmp(argv[i], "telnet"))
+ flags |= LOADER_FLAGS_TELNETD;
else if (!strcasecmp(argv[i], "nofirewire"))
flags |= LOADER_FLAGS_NOIEEE1394;
else if (!strcasecmp(argv[i], "noprobe"))
@@ -865,7 +869,8 @@ int main(int argc, char ** argv) {
}
}
- /* JKFIXME: telnetd */
+ if (FL_TELNETD(flags))
+ startTelnetd(&kd, &loaderData, modInfo, modLoaded, modDeps, flags);
url = doLoaderMain("/mnt/source", &loaderData, &kd, modInfo, modLoaded, &modDeps, flags);