diff options
author | jkh <jkh@FreeBSD.org> | 1997-02-16 23:35:05 +0000 |
---|---|---|
committer | jkh <jkh@FreeBSD.org> | 1997-02-16 23:35:05 +0000 |
commit | 19ad0dbdf12f6324071c4cb9e46479ccf1534a9a (patch) | |
tree | 99b107d8a5a7426351640313cb438e04a2b32e9e /release | |
parent | c7d9d054eda1f602ac35addae882dc7fae9020ac (diff) | |
download | FreeBSD-src-19ad0dbdf12f6324071c4cb9e46479ccf1534a9a.zip FreeBSD-src-19ad0dbdf12f6324071c4cb9e46479ccf1534a9a.tar.gz |
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.
Diffstat (limited to 'release')
-rw-r--r-- | release/sysinstall/config.c | 2 | ||||
-rw-r--r-- | release/sysinstall/install.c | 7 |
2 files changed, 1 insertions, 8 deletions
diff --git a/release/sysinstall/config.c b/release/sysinstall/config.c index cb43a6b..51ab69b 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 769221b..08166c8 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); } |