diff options
Diffstat (limited to 'mdk-stage1/network.c')
| -rw-r--r-- | mdk-stage1/network.c | 17 |
1 files changed, 9 insertions, 8 deletions
diff --git a/mdk-stage1/network.c b/mdk-stage1/network.c index ef9dd2814..6e3449f76 100644 --- a/mdk-stage1/network.c +++ b/mdk-stage1/network.c @@ -279,7 +279,7 @@ static int save_netinfo(struct interface_info * intf) { fprintf(f, "NETWORKING=yes\n"); fprintf(f, "FORWARD_IPV4=false\n"); - if (hostname) + if (hostname && !intf->boot_proto == BOOTPROTO_DHCP) fprintf(f, "HOSTNAME=%s\n", hostname); if (domain) fprintf(f, "DOMAINNAME=%s\n", domain); @@ -466,9 +466,10 @@ static enum return_type configure_network(struct interface_info * intf) dnshostname = mygethostbyaddr(inet_ntoa(intf->ip)); if (dnshostname) { - hostname = strdup(dnshostname); - domain = strchr(strdup(hostname), '.') + 1; - log_message("got hostname and domain from dns entry, %s and %s", hostname, domain); + if (intf->boot_proto == BOOTPROTO_STATIC) + hostname = strdup(dnshostname); + domain = strchr(strdup(dnshostname), '.') + 1; + log_message("got hostname and domain from dns entry, %s and %s", dnshostname, domain); return RETURN_OK; } @@ -692,8 +693,8 @@ enum return_type ftp_prepare(void) enum return_type results; if (!ramdisk_possible()) { - stg1_error_message("FTP install needs more than %d Mbytes of memory (detected %d Mbytes).", - MEM_LIMIT_RAMDISK, total_memory()); + stg1_error_message("FTP install needs more than %d Mbytes of memory (detected %d Mbytes). You may want to try an NFS install.", + MEM_LIMIT_RAMDISK, total_memory()); return RETURN_ERROR; } @@ -779,8 +780,8 @@ enum return_type http_prepare(void) enum return_type results; if (!ramdisk_possible()) { - stg1_error_message("HTTP install needs more than %d Mbytes of memory (detected %d Mbytes).", - MEM_LIMIT_RAMDISK, total_memory()); + stg1_error_message("HTTP install needs more than %d Mbytes of memory (detected %d Mbytes). You may want to try an NFS install.", + MEM_LIMIT_RAMDISK, total_memory()); return RETURN_ERROR; } |