1. Always write out /etc/hosts.

2. Back out my change to ask about UTC/Localtime here.  This *really* needs
   to be done in tzsetup instead since putting it here only handles about
   1/4 of the places where it needs to be.

6 files changed, 3 insertions, 24 deletions

diff --git a/release/sysinstall/config.c b/release/sysinstall/config.c
index cb43a6be0f29..51ab69bb9394 100644
--- a/release/sysinstall/config.c
+++ b/release/sysinstall/config.c
@@ -524,8 +524,6 @@ skip:
     dp = variable_get(VAR_DOMAINNAME);
     cp = variable_get(VAR_IPADDR);
     hp = variable_get(VAR_HOSTNAME);
-    if ((!dp || !cp || !hp) && file_readable("/etc/hosts"))
-	return;
     /* Tack ourselves into /etc/hosts */
     fp = fopen("/etc/hosts", "w");
     if (!fp)
diff --git a/release/sysinstall/install.c b/release/sysinstall/install.c
index 769221b64282..08166c88b586 100644
--- a/release/sysinstall/install.c
+++ b/release/sysinstall/install.c
@@ -549,12 +549,7 @@ installNovice(dialogMenuItem *self)
 	WINDOW *w = savescr();
 
 	dialog_clear();
-	if (!msgYesNo("Is this machine's CMOS clock set to local time?\n"
-		      "If it is set to UTC, please select NO here"))
-	    system("touch /etc/wall_cmos_clock");
-	else
-	    system("rm -f /etc/wall_cmos_clock");
-	systemExecute("rm -f /etc/localtime; tzsetup");
+	systemExecute("rm -f /etc/localtime /etc/wall_cmos_clock; tzsetup");
 	restorescr(w);
     }
 
diff --git a/usr.sbin/sade/config.c b/usr.sbin/sade/config.c
index cb43a6be0f29..51ab69bb9394 100644
--- a/usr.sbin/sade/config.c
+++ b/usr.sbin/sade/config.c
@@ -524,8 +524,6 @@ skip:
     dp = variable_get(VAR_DOMAINNAME);
     cp = variable_get(VAR_IPADDR);
     hp = variable_get(VAR_HOSTNAME);
-    if ((!dp || !cp || !hp) && file_readable("/etc/hosts"))
-	return;
     /* Tack ourselves into /etc/hosts */
     fp = fopen("/etc/hosts", "w");
     if (!fp)
diff --git a/usr.sbin/sade/install.c b/usr.sbin/sade/install.c
index 769221b64282..08166c88b586 100644
--- a/usr.sbin/sade/install.c
+++ b/usr.sbin/sade/install.c
@@ -549,12 +549,7 @@ installNovice(dialogMenuItem *self)
 	WINDOW *w = savescr();
 
 	dialog_clear();
-	if (!msgYesNo("Is this machine's CMOS clock set to local time?\n"
-		      "If it is set to UTC, please select NO here"))
-	    system("touch /etc/wall_cmos_clock");
-	else
-	    system("rm -f /etc/wall_cmos_clock");
-	systemExecute("rm -f /etc/localtime; tzsetup");
+	systemExecute("rm -f /etc/localtime /etc/wall_cmos_clock; tzsetup");
 	restorescr(w);
     }
 
diff --git a/usr.sbin/sysinstall/config.c b/usr.sbin/sysinstall/config.c
index cb43a6be0f29..51ab69bb9394 100644
--- a/usr.sbin/sysinstall/config.c
+++ b/usr.sbin/sysinstall/config.c
@@ -524,8 +524,6 @@ skip:
     dp = variable_get(VAR_DOMAINNAME);
     cp = variable_get(VAR_IPADDR);
     hp = variable_get(VAR_HOSTNAME);
-    if ((!dp || !cp || !hp) && file_readable("/etc/hosts"))
-	return;
     /* Tack ourselves into /etc/hosts */
     fp = fopen("/etc/hosts", "w");
     if (!fp)
diff --git a/usr.sbin/sysinstall/install.c b/usr.sbin/sysinstall/install.c
index 769221b64282..08166c88b586 100644
--- a/usr.sbin/sysinstall/install.c
+++ b/usr.sbin/sysinstall/install.c
@@ -549,12 +549,7 @@ installNovice(dialogMenuItem *self)
 	WINDOW *w = savescr();
 
 	dialog_clear();
-	if (!msgYesNo("Is this machine's CMOS clock set to local time?\n"
-		      "If it is set to UTC, please select NO here"))
-	    system("touch /etc/wall_cmos_clock");
-	else
-	    system("rm -f /etc/wall_cmos_clock");
-	systemExecute("rm -f /etc/localtime; tzsetup");
+	systemExecute("rm -f /etc/localtime /etc/wall_cmos_clock; tzsetup");
 	restorescr(w);
     }