From 3de899a11ed8d65f16856835dbe2a3db4abeb1d1 Mon Sep 17 00:00:00 2001 From: "Jordan K. Hubbard" Date: Mon, 10 Feb 1997 10:21:07 +0000 Subject: [PATCH] Allow the user to choose UTC or local time. --- release/sysinstall/install.c | 13 +++++++++---- usr.sbin/sade/install.c | 13 +++++++++---- usr.sbin/sysinstall/install.c | 13 +++++++++---- 3 files changed, 27 insertions(+), 12 deletions(-) diff --git a/release/sysinstall/install.c b/release/sysinstall/install.c index 7c7a6406df1b..3584156ce9b0 100644 --- a/release/sysinstall/install.c +++ b/release/sysinstall/install.c @@ -551,7 +551,12 @@ installNovice(dialogMenuItem *self) WINDOW *w = savescr(); dialog_clear(); - systemExecute("rm -f /etc/wall_cmos_clock /etc/localtime; tzsetup"); + 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"); restorescr(w); } @@ -570,9 +575,9 @@ installNovice(dialogMenuItem *self) } dialog_clear_norefresh(); - if (!msgYesNo("The FreeBSD package collection is a collection of over 700 ready-to-run\n" - "applications, from text editors to games to WEB servers. Would you like\n" - "to browse the collection now?")) + if (!msgYesNo("The FreeBSD package collection is a collection of hundreds of ready-to-run\n" + "applications, from text editors to games to WEB servers and more. Would you\n" + "like to browse the collection now?")) configPackages(self); dialog_clear_norefresh(); diff --git a/usr.sbin/sade/install.c b/usr.sbin/sade/install.c index 7c7a6406df1b..3584156ce9b0 100644 --- a/usr.sbin/sade/install.c +++ b/usr.sbin/sade/install.c @@ -551,7 +551,12 @@ installNovice(dialogMenuItem *self) WINDOW *w = savescr(); dialog_clear(); - systemExecute("rm -f /etc/wall_cmos_clock /etc/localtime; tzsetup"); + 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"); restorescr(w); } @@ -570,9 +575,9 @@ installNovice(dialogMenuItem *self) } dialog_clear_norefresh(); - if (!msgYesNo("The FreeBSD package collection is a collection of over 700 ready-to-run\n" - "applications, from text editors to games to WEB servers. Would you like\n" - "to browse the collection now?")) + if (!msgYesNo("The FreeBSD package collection is a collection of hundreds of ready-to-run\n" + "applications, from text editors to games to WEB servers and more. Would you\n" + "like to browse the collection now?")) configPackages(self); dialog_clear_norefresh(); diff --git a/usr.sbin/sysinstall/install.c b/usr.sbin/sysinstall/install.c index 7c7a6406df1b..3584156ce9b0 100644 --- a/usr.sbin/sysinstall/install.c +++ b/usr.sbin/sysinstall/install.c @@ -551,7 +551,12 @@ installNovice(dialogMenuItem *self) WINDOW *w = savescr(); dialog_clear(); - systemExecute("rm -f /etc/wall_cmos_clock /etc/localtime; tzsetup"); + 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"); restorescr(w); } @@ -570,9 +575,9 @@ installNovice(dialogMenuItem *self) } dialog_clear_norefresh(); - if (!msgYesNo("The FreeBSD package collection is a collection of over 700 ready-to-run\n" - "applications, from text editors to games to WEB servers. Would you like\n" - "to browse the collection now?")) + if (!msgYesNo("The FreeBSD package collection is a collection of hundreds of ready-to-run\n" + "applications, from text editors to games to WEB servers and more. Would you\n" + "like to browse the collection now?")) configPackages(self); dialog_clear_norefresh();