If the hostname was not looked up from DNS and domain is still

"localdomain" at time it should be written into resolv.conf, try to guess
it from hostname.
Without this, for pure CD-ROM install one gets search localdomain in resolv.conf
which is not a good idea.

1 files changed, 9 insertions, 0 deletions

diff --git a/todo.py b/todo.py
index 456a7721a..66717b795 100644
--- a/todo.py
+++ b/todo.py
@@ -925,6 +925,15 @@ class ToDo:
                 f.write ("%s\t\t%s\n" % (ip, dev.hostname))
         f.close ()
 
+	# If the hostname was not looked up, but typed in by the user,
+	# domain might not be computed, so do it now.
+	if self.network.domains == [ "localdomain" ] or not self.network.domains:
+	    if self.network.hostname != "localhost.localdomain":
+		if '.' in self.network.hostname:
+		    # chop off everything before the leading '.'
+		    domain = self.network.hostname[(string.find(self.network.hostname, '.') + 1):]
+		    self.network.domains = [ domain ]
+
         # /etc/resolv.conf
         f = open (self.instPath + "/etc/resolv.conf", "w")
         f.write ("search " + string.joinfields (self.network.domains, ' ') + "\n")