summaryrefslogtreecommitdiffstats
path: root/loader
diff options
context:
space:
mode:
authorDavid Cantrell <dcantrell@redhat.com>2008-12-17 19:04:57 -1000
committerDavid Cantrell <dcantrell@redhat.com>2008-12-18 10:12:10 -1000
commit6d7171b88215c008ea813b9130ca54b0cf3067be (patch)
tree30d615757b6ea75e781605c56408b710ffbfa365 /loader
parent4227498343144cf5b3b8a48d0b5fbc55c34cd6fb (diff)
downloadanaconda-6d7171b88215c008ea813b9130ca54b0cf3067be.tar.gz
anaconda-6d7171b88215c008ea813b9130ca54b0cf3067be.tar.xz
anaconda-6d7171b88215c008ea813b9130ca54b0cf3067be.zip
Fix telnet install support (#471082)
Someone tried it in F-10 and reported that it didn't work. The startTelnetd() function in telnetd.c needed some changes. [rawhide]
Diffstat (limited to 'loader')
-rw-r--r--loader/telnetd.c16
1 files changed, 10 insertions, 6 deletions
diff --git a/loader/telnetd.c b/loader/telnetd.c
index 99c6feb24..17935bf72 100644
--- a/loader/telnetd.c
+++ b/loader/telnetd.c
@@ -230,7 +230,7 @@ int beTelnet(void) {
}
void startTelnetd(struct loaderData_s * loaderData) {
- char ret[INET_ADDRSTRLEN+1];
+ char *ipaddr = NULL;
iface_t iface;
iface_init_iface_t(&iface);
@@ -240,12 +240,16 @@ void startTelnetd(struct loaderData_s * loaderData) {
return;
}
- if (iface.ipaddr.s_addr) {
- inet_ntop(AF_INET, &iface.ipaddr, ret, INET_ADDRSTRLEN);
- logMessage(INFO, "going to beTelnet for %s", ret);
- if (!beTelnet())
- flags |= LOADER_FLAGS_TEXT | LOADER_FLAGS_NOSHELL;
+ ipaddr = iface_ip2str(iface.device, AF_INET);
+ if (ipaddr == NULL) {
+ logMessage(ERROR, "%s (%d): no IP address found for %s",
+ __func__, __LINE__, iface.device);
+ return;
}
+ logMessage(INFO, "going to beTelnet for %s", ipaddr);
+ if (!beTelnet())
+ flags |= LOADER_FLAGS_TEXT | LOADER_FLAGS_NOSHELL;
+
return;
}