diff -pruN 0.131/debian/changelog 0.131ubuntu1/debian/changelog --- 0.131/debian/changelog 2016-12-07 06:44:17.000000000 +0000 +++ 0.131ubuntu1/debian/changelog 2017-01-30 21:58:35.000000000 +0000 @@ -1,3 +1,13 @@ +clock-setup (0.131ubuntu1) zesty; urgency=medium + + * Merge from Debian unstable. (LP: #1660362) Remaining changes: + - Default to ntp.ubuntu.com for the NTP server. + - Ask the UTC question, defaulting to true, even if we appear to be the + only OS (unless clock-setup/utc-auto is preseeded to true). + - Pass --noadjfile to hwclock. + + -- Dave Chiluk Mon, 30 Jan 2017 15:58:35 -0600 + clock-setup (0.131) unstable; urgency=medium * Really drop Otavio. Sigh... @@ -18,6 +28,16 @@ clock-setup (0.129) unstable; urgency=me -- Christian Perrier Sun, 14 Aug 2016 14:17:14 +0200 +clock-setup (0.128ubuntu1) yakkety; urgency=low + + * Merge from Debian unstable. (LP: #1593217) Remaining changes: + - Default to ntp.ubuntu.com for the NTP server. + - Ask the UTC question, defaulting to true, even if we appear to be the + only OS (unless clock-setup/utc-auto is preseeded to true). + - Pass --noadjfile to hwclock. + + -- Dave Chiluk Sun, 16 Jun 2016 08:56:21 +0100 + clock-setup (0.128) unstable; urgency=medium [ Colin Watson ] @@ -33,6 +53,23 @@ clock-setup (0.127) unstable; urgency=me -- Christian Perrier Fri, 22 Jan 2016 07:50:17 +0100 +clock-setup (0.126ubuntu2) yakkety; urgency=medium + + * finish-install.d/10clock-setup: guard against rcS not existing on disk + when we try to update it. (LP: #1587555) + + -- Mathieu Trudel-Lapierre Wed, 08 Jun 2016 13:42:48 -0400 + +clock-setup (0.126ubuntu1) xenial; urgency=medium + + * Resynchronise with Debian. Remaining changes: + - Default to ntp.ubuntu.com for the NTP server. + - Ask the UTC question, defaulting to true, even if we appear to be the + only OS (unless clock-setup/utc-auto is preseeded to true). + - Pass --noadjfile to hwclock. + + -- Mathieu Trudel-Lapierre Wed, 23 Dec 2015 15:39:05 -0500 + clock-setup (0.126) unstable; urgency=medium [ Updated translations ] @@ -68,6 +105,16 @@ clock-setup (0.122) unstable; urgency=lo -- Christian Perrier Sat, 07 Mar 2015 21:39:55 +0100 +clock-setup (0.121ubuntu1) vivid; urgency=medium + + * Resynchronise with Debian. Remaining changes: + - Default to ntp.ubuntu.com for the NTP server. + - Ask the UTC question, defaulting to true, even if we appear to be the + only OS (unless clock-setup/utc-auto is preseeded to true). + - Pass --noadjfile to hwclock. + + -- Colin Watson Thu, 04 Dec 2014 10:11:57 +0000 + clock-setup (0.121) unstable; urgency=low [ Updated translations ] @@ -98,6 +145,16 @@ clock-setup (0.118) unstable; urgency=lo -- Christian Perrier Fri, 08 Nov 2013 22:01:02 +0100 +clock-setup (0.117ubuntu1) saucy; urgency=low + + * Resynchronise with Debian. Remaining changes: + - Default to ntp.ubuntu.com for the NTP server. + - Ask the UTC question, defaulting to true, even if we appear to be the + only OS (unless clock-setup/utc-auto is preseeded to true). + - Pass --noadjfile to hwclock. + + -- Colin Watson Tue, 10 Sep 2013 23:32:34 +0100 + clock-setup (0.117) unstable; urgency=low [ Updated translations ] @@ -105,6 +162,16 @@ clock-setup (0.117) unstable; urgency=lo -- Christian Perrier Fri, 16 Aug 2013 08:43:44 +0200 +clock-setup (0.116ubuntu1) saucy; urgency=low + + * Resynchronise with Debian. Remaining changes: + - Default to ntp.ubuntu.com for the NTP server. + - Ask the UTC question, defaulting to true, even if we appear to be the + only OS (unless clock-setup/utc-auto is preseeded to true). + - Pass --noadjfile to hwclock. + + -- Colin Watson Fri, 02 Aug 2013 11:14:30 +0100 + clock-setup (0.116) unstable; urgency=low [ Dmitrijs Ledkovs ] @@ -117,6 +184,16 @@ clock-setup (0.116) unstable; urgency=lo -- Christian Perrier Sat, 13 Jul 2013 12:52:18 +0200 +clock-setup (0.115ubuntu1) saucy; urgency=low + + * Resynchronise with Debian. Remaining changes: + - Default to ntp.ubuntu.com for the NTP server. + - Ask the UTC question, defaulting to true, even if we appear to be the + only OS (unless clock-setup/utc-auto is preseeded to true). + - Pass --noadjfile to hwclock. + + -- Colin Watson Wed, 05 Jun 2013 11:49:59 +0100 + clock-setup (0.115) unstable; urgency=low [ Colin Watson ] @@ -127,6 +204,16 @@ clock-setup (0.115) unstable; urgency=lo -- Christian Perrier Thu, 16 May 2013 17:33:59 +0200 +clock-setup (0.114ubuntu1) saucy; urgency=low + + * Resynchronise with Debian. Remaining changes: + - Default to ntp.ubuntu.com for the NTP server. + - Ask the UTC question, defaulting to true, even if we appear to be the + only OS (unless clock-setup/utc-auto is preseeded to true). + - Pass --noadjfile to hwclock. + + -- Colin Watson Tue, 30 Apr 2013 01:14:25 +0100 + clock-setup (0.114) unstable; urgency=low [ Updated translations ] @@ -134,6 +221,16 @@ clock-setup (0.114) unstable; urgency=lo -- Christian Perrier Sun, 09 Dec 2012 18:40:19 +0100 +clock-setup (0.113ubuntu1) raring; urgency=low + + * Resynchronise with Debian. Remaining changes: + - Default to ntp.ubuntu.com for the NTP server. + - Ask the UTC question, defaulting to true, even if we appear to be the + only OS (unless clock-setup/utc-auto is preseeded to true). + - Pass --noadjfile to hwclock. + + -- Colin Watson Mon, 29 Oct 2012 10:50:30 +0000 + clock-setup (0.113) unstable; urgency=low * Really replace XC-Package-Type by Package-Type in debian/control @@ -145,6 +242,16 @@ clock-setup (0.113) unstable; urgency=lo -- Christian Perrier Wed, 17 Oct 2012 09:08:10 +0200 +clock-setup (0.112ubuntu1) quantal; urgency=low + + * Resynchronise with Debian. Remaining changes: + - Default to ntp.ubuntu.com for the NTP server. + - Ask the UTC question, defaulting to true, even if we appear to be the + only OS (unless clock-setup/utc-auto is preseeded to true). + - Pass --noadjfile to hwclock. + + -- Colin Watson Mon, 25 Jun 2012 14:01:11 +0100 + clock-setup (0.112) unstable; urgency=low * Team upload @@ -180,6 +287,16 @@ clock-setup (0.111) unstable; urgency=lo -- Joey Hess Mon, 21 May 2012 16:26:35 -0400 +clock-setup (0.110ubuntu1) quantal; urgency=low + + * Resynchronise with Debian. Remaining changes: + - Default to ntp.ubuntu.com for the NTP server. + - Ask the UTC question, defaulting to true, even if we appear to be the + only OS (unless clock-setup/utc-auto is preseeded to true). + - Pass --noadjfile to hwclock. + + -- Colin Watson Wed, 02 May 2012 13:03:59 +0100 + clock-setup (0.110) unstable; urgency=low * /etc/default/hwclock supersedes /etc/default/rcS as the location @@ -189,6 +306,16 @@ clock-setup (0.110) unstable; urgency=lo -- Joey Hess Sun, 12 Feb 2012 15:28:20 -0400 +clock-setup (0.109ubuntu1) precise; urgency=low + + * Resynchronise with Debian. Remaining changes: + - Default to ntp.ubuntu.com for the NTP server. + - Ask the UTC question, defaulting to true, even if we appear to be the + only OS (unless clock-setup/utc-auto is preseeded to true). + - Pass --noadjfile to hwclock. + + -- Colin Watson Tue, 18 Oct 2011 18:20:59 +0100 + clock-setup (0.109) unstable; urgency=low [ Colin Watson ] @@ -213,6 +340,16 @@ clock-setup (0.109) unstable; urgency=lo -- Philipp Kern Sun, 02 Oct 2011 22:18:17 +0200 +clock-setup (0.108ubuntu1) oneiric; urgency=low + + * Resynchronise with Debian. Remaining changes: + - Default to ntp.ubuntu.com for the NTP server. + - Ask the UTC question, defaulting to true, even if we appear to be the + only OS (unless clock-setup/utc-auto is preseeded to true). + - Pass --noadjfile to hwclock. + + -- Colin Watson Thu, 05 May 2011 13:56:35 +0100 + clock-setup (0.108) unstable; urgency=low * Fix syntax errors in finish-install.d/10clock-setup, introduced in @@ -245,6 +382,18 @@ clock-setup (0.107) unstable; urgency=lo -- Christian Perrier Sun, 24 Apr 2011 08:20:12 +0200 +clock-setup (0.106ubuntu1) natty; urgency=low + + * Resynchronise with Debian. Remaining changes: + - Default to ntp.ubuntu.com for the NTP server. + - Ask the UTC question, defaulting to true, even if we appear to be the + only OS (unless clock-setup/utc-auto is preseeded to true). + - Apparently OpenSolaris keeps the hardware clock in local time + (surprisingly). Assume UTC=no if Solaris is detected. + - Pass --noadjfile to hwclock. + + -- Colin Watson Wed, 26 Jan 2011 14:10:27 +0000 + clock-setup (0.106) unstable; urgency=low [ Colin Watson ] @@ -258,6 +407,18 @@ clock-setup (0.106) unstable; urgency=lo -- Otavio Salvador Fri, 24 Dec 2010 19:31:37 -0200 +clock-setup (0.105ubuntu1) natty; urgency=low + + * Resynchronise with Debian. Remaining changes: + - Default to ntp.ubuntu.com for the NTP server. + - Ask the UTC question, defaulting to true, even if we appear to be the + only OS (unless clock-setup/utc-auto is preseeded to true). + - Apparently OpenSolaris keeps the hardware clock in local time + (surprisingly). Assume UTC=no if Solaris is detected. + - Pass --noadjfile to hwclock. + + -- Colin Watson Mon, 15 Nov 2010 10:35:58 +0000 + clock-setup (0.105) unstable; urgency=low [ Joey Hess ] @@ -277,6 +438,18 @@ clock-setup (0.105) unstable; urgency=lo -- Otavio Salvador Fri, 12 Nov 2010 10:04:12 -0200 +clock-setup (0.104ubuntu1) natty; urgency=low + + * Resynchronise with Debian. Remaining changes: + - Default to ntp.ubuntu.com for the NTP server. + - Ask the UTC question, defaulting to true, even if we appear to be the + only OS (unless clock-setup/utc-auto is preseeded to true). + - Apparently OpenSolaris keeps the hardware clock in local time + (surprisingly). Assume UTC=no if Solaris is detected. + - Pass --noadjfile to hwclock. + + -- Colin Watson Tue, 12 Oct 2010 11:47:56 +0100 + clock-setup (0.104) unstable; urgency=low * Don't bind mount /dev to /target/dev before calling hwclock. It is @@ -294,6 +467,18 @@ clock-setup (0.104) unstable; urgency=lo -- Aurelien Jarno Mon, 23 Aug 2010 00:16:40 +0200 +clock-setup (0.103ubuntu1) maverick; urgency=low + + * Resynchronise with Debian. Remaining changes: + - Default to ntp.ubuntu.com for the NTP server. + - Ask the UTC question, defaulting to true, even if we appear to be the + only OS (unless clock-setup/utc-auto is preseeded to true). + - Apparently OpenSolaris keeps the hardware clock in local time + (surprisingly). Assume UTC=no if Solaris is detected. + - Pass --noadjfile to hwclock. + + -- Colin Watson Sun, 01 Aug 2010 17:07:00 -0500 + clock-setup (0.103) unstable; urgency=low [ Updated translations ] @@ -320,6 +505,18 @@ clock-setup (0.103) unstable; urgency=lo -- Christian Perrier Sun, 11 Jul 2010 10:30:40 +0200 +clock-setup (0.102ubuntu1) lucid; urgency=low + + * Resynchronise with Debian. Remaining changes: + - Default to ntp.ubuntu.com for the NTP server. + - Ask the UTC question, defaulting to true, even if we appear to be the + only OS (unless clock-setup/utc-auto is preseeded to true). + - Apparently OpenSolaris keeps the hardware clock in local time + (surprisingly). Assume UTC=no if Solaris is detected. + - Pass --noadjfile to hwclock. + + -- Colin Watson Sat, 13 Feb 2010 15:47:26 +0000 + clock-setup (0.102) unstable; urgency=low * Use log-output when calling set-date-epoch. @@ -346,6 +543,18 @@ clock-setup (0.101) unstable; urgency=lo -- Frans Pop Mon, 14 Dec 2009 21:54:16 +0100 +clock-setup (0.100ubuntu1) lucid; urgency=low + + * Resynchronise with Debian. Remaining changes: + - Default to ntp.ubuntu.com for the NTP server. + - Ask the UTC question, defaulting to true, even if we appear to be the + only OS (unless clock-setup/utc-auto is preseeded to true). + - Apparently OpenSolaris keeps the hardware clock in local time + (surprisingly). Assume UTC=no if Solaris is detected. + - Pass --noadjfile to hwclock. + + -- Colin Watson Mon, 09 Nov 2009 17:43:01 +0000 + clock-setup (0.100) unstable; urgency=low * finish-install: there's no need anymore to create a /dev/rtc symlink. @@ -388,6 +597,38 @@ clock-setup (0.99) unstable; urgency=low -- Frans Pop Sun, 02 Aug 2009 10:40:41 +0200 +clock-setup (0.98ubuntu3) karmic; urgency=low + + * If we didn't manage to sync the clock to NTP, then don't set the + hardware clock. At best, all we'll be doing is writing back the value + present when d-i started plus d-i's run-time; at worst, we'll also + introduce a timezone error (LP: #440281). + + -- Colin Watson Mon, 19 Oct 2009 01:06:47 +0100 + +clock-setup (0.98ubuntu2) karmic; urgency=low + + * Pass --utc or --localtime option to hwclock as appropriate, as well as + --noadjfile (LP: #423247). + + -- Colin Watson Thu, 03 Sep 2009 21:23:59 +0100 + +clock-setup (0.98ubuntu1) karmic; urgency=low + + * Resynchronise with Debian. Remaining changes: + - Default to ntp.ubuntu.com for the NTP server. + - Ask the UTC question, defaulting to true, even if we appear to be the + only OS (unless clock-setup/utc-auto is preseeded to true). + - Add lpia to architecture list. + - Fix rdate-udeb dependency to include the epoch. + - Fix handling of progress bar cancellation. + - Apparently OpenSolaris keeps the hardware clock in local time + (surprisingly). Assume UTC=no if Solaris is detected. + - Check for the existence of /etc/adjtime before running sed over it, + given util-linux 2.14.2-1ubuntu4. + + -- Colin Watson Mon, 15 Jun 2009 10:41:56 +0100 + clock-setup (0.98) unstable; urgency=low [ Colin Watson ] @@ -416,6 +657,34 @@ clock-setup (0.98) unstable; urgency=low -- Christian Perrier Thu, 11 Jun 2009 21:45:06 +0200 +clock-setup (0.97ubuntu3) jaunty; urgency=low + + * Use 'update-dev --settle' rather than 'update-dev' after loading rtc + modules. Requires di-utils 1.66. + + -- Colin Watson Thu, 05 Mar 2009 09:21:50 +0000 + +clock-setup (0.97ubuntu2) jaunty; urgency=low + + * Check for the existence of /etc/adjtime before running sed over it, + given util-linux 2.14.2-1ubuntu4. + + -- Evan Dandrea Tue, 24 Feb 2009 13:51:25 +0000 + +clock-setup (0.97ubuntu1) jaunty; urgency=low + + * Resynchronise with Debian. Remaining changes: + - Default to ntp.ubuntu.com for the NTP server. + - Ask the UTC question, defaulting to true, even if we appear to be the + only OS (unless clock-setup/utc-auto is preseeded to true). + - Add lpia to architecture list. + - Fix rdate-udeb dependency to include the epoch. + - Fix handling of progress bar cancellation. + * Apparently OpenSolaris keeps the hardware clock in local time + (surprisingly). Assume UTC=no if Solaris is detected (LP: #279065). + + -- Colin Watson Wed, 05 Nov 2008 12:33:19 +0000 + clock-setup (0.97) unstable; urgency=low [ Updated translations ] @@ -439,6 +708,26 @@ clock-setup (0.97) unstable; urgency=low -- Otavio Salvador Sun, 21 Sep 2008 19:03:32 -0300 +clock-setup (0.96ubuntu2) intrepid; urgency=low + + * Fix handling of progress bar cancellation (LP: #262500): + - db_progress INFO might be cancelled if the user is quick; cope with + that. + - Reset the progresscancel capability when we're finished. + + -- Colin Watson Sun, 14 Sep 2008 13:13:36 +0100 + +clock-setup (0.96ubuntu1) intrepid; urgency=low + + * Resynchronise with Debian. Remaining changes: + - Default to ntp.ubuntu.com for the NTP server. + - Ask the UTC question, defaulting to true, even if we appear to be the + only OS (unless clock-setup/utc-auto is preseeded to true). + - Add lpia to architecture list. + * Fix rdate-udeb dependency to include the epoch. + + -- Colin Watson Sat, 26 Jul 2008 23:34:38 +0100 + clock-setup (0.96) unstable; urgency=low [ Frans Pop ] @@ -468,6 +757,16 @@ clock-setup (0.96) unstable; urgency=low -- Jérémy Bobbio Tue, 22 Jul 2008 15:15:22 +0000 +clock-setup (0.95ubuntu1) intrepid; urgency=low + + * Resynchronise with Debian. Remaining changes: + - Default to ntp.ubuntu.com for the NTP server. + - Ask the UTC question, defaulting to true, even if we appear to be the + only OS (unless clock-setup/utc-auto is preseeded to true). + - Add lpia to architecture list. + + -- Colin Watson Wed, 07 May 2008 12:57:48 +0100 + clock-setup (0.95) unstable; urgency=low [ Joey Hess ] @@ -527,6 +826,29 @@ clock-setup (0.93) unstable; urgency=low -- Joey Hess Mon, 07 Jan 2008 17:44:45 -0500 +clock-setup (0.92ubuntu3) hardy; urgency=low + + * Add clock-setup/utc-auto template; if preseeded to true and we are the + only OS on the disk, clock-setup/utc will not be asked. + + -- Colin Watson Mon, 31 Mar 2008 15:21:43 +0100 + +clock-setup (0.92ubuntu2) hardy; urgency=low + + * Add lpia to architecture list. + + -- Colin Watson Fri, 07 Mar 2008 00:36:34 +0000 + +clock-setup (0.92ubuntu1) hardy; urgency=low + + * Resynchronise with Debian. Remaining changes: + - Default to ntp.ubuntu.com for the NTP server. + - Ask the UTC question, defaulting to true, even if we appear to be the + only OS. + * Set Vcs-Bzr to the Ubuntu branch. + + -- Evan Dandrea Tue, 27 Nov 2007 10:24:19 -0500 + clock-setup (0.92) unstable; urgency=low * rtc-dev is built-in on nslu2 in 2.6.22, still try to load the module for @@ -609,6 +931,14 @@ clock-setup (0.90) unstable; urgency=low -- Joey Hess Wed, 25 Jul 2007 13:38:23 -0400 +clock-setup (0.16ubuntu1) gutsy; urgency=low + + * Resynchronise with Debian. Remaining changes: + - Ask the UTC question, defaulting to true, even if we appear to be the + only OS. + + -- Colin Watson Thu, 26 Apr 2007 17:05:00 +0100 + clock-setup (0.16) unstable; urgency=low * Multiply menu-item-numbers by 100 @@ -657,6 +987,20 @@ clock-setup (0.13) unstable; urgency=low -- Frans Pop Wed, 31 Jan 2007 11:32:27 +0100 +clock-setup (0.12ubuntu2) feisty; urgency=low + + * Set Maintainer to ubuntu-installer@lists.ubuntu.com. + + -- Colin Watson Fri, 16 Feb 2007 10:25:23 +0000 + +clock-setup (0.12ubuntu1) feisty; urgency=low + + * Resynchronise with Debian. Remaining changes: + - Ask the UTC question, defaulting to true, even if we appear to be the + only OS. + + -- Colin Watson Thu, 9 Nov 2006 07:42:59 -0800 + clock-setup (0.12) unstable; urgency=low * Stop progress bar if is selected. @@ -704,6 +1048,12 @@ clock-setup (0.11) unstable; urgency=low -- Frans Pop Sat, 16 Sep 2006 11:35:10 +0200 +clock-setup (0.10ubuntu1) edgy; urgency=low + + * Resynchronise with Debian. + + -- Colin Watson Wed, 28 Jun 2006 11:54:34 +0100 + clock-setup (0.10) unstable; urgency=low * Add kfreebsd-amd64 to arch list. Closes: #363661 @@ -744,6 +1094,22 @@ clock-setup (0.9) unstable; urgency=low -- Frans Pop Mon, 20 Mar 2006 18:32:59 +0100 +clock-setup (0.8ubuntu1) dapper; urgency=low + + * OS probing doesn't reliably tell us when we're the only OS on the + system, and even if it does we can't necessarily assume that that means + the hardware clock is set to UTC. Therefore, ask the UTC question, + defaulting to true, even if we appear to be the only OS (closes: Malone + #28961). + + -- Colin Watson Wed, 17 May 2006 19:52:20 +0100 + +clock-setup (0.8build1) dapper; urgency=low + + * Fake sync from Debian (UVF exception OK mdz@). + + -- Colin Watson Mon, 20 Mar 2006 18:40:32 +0000 + clock-setup (0.8) unstable; urgency=low [ Martin Michlmayr ] diff -pruN 0.131/debian/clock-setup.templates 0.131ubuntu1/debian/clock-setup.templates --- 0.131/debian/clock-setup.templates 2011-01-19 04:32:55.000000000 +0000 +++ 0.131ubuntu1/debian/clock-setup.templates 2017-01-30 20:15:36.000000000 +0000 @@ -14,6 +14,12 @@ _Description: Is the system clock set to local time. This is recommended unless you also use another operating system that expects the clock to be set to local time. +Template: clock-setup/utc-auto +Type: boolean +Default: false +Description: for internal use; can be preseeded + If true and we are the only OS on the disk, don't ask clock-setup/utc. + Template: finish-install/progress/clock-setup Type: text # progress bar item @@ -35,7 +41,7 @@ _Description: Set the clock using NTP? Template: clock-setup/ntp-server Type: string -Default: 0.debian.pool.ntp.org +Default: ntp.ubuntu.com # :sl2: _Description: NTP server to use: The default NTP server is almost always a good choice, but if diff -pruN 0.131/debian/control 0.131ubuntu1/debian/control --- 0.131/debian/control 2016-12-07 06:44:14.000000000 +0000 +++ 0.131ubuntu1/debian/control 2017-01-30 21:58:35.000000000 +0000 @@ -1,11 +1,13 @@ Source: clock-setup Section: debian-installer Priority: standard -Maintainer: Debian Install System Team +Maintainer: Ubuntu Installer Team +XSBC-Original-Maintainer: Debian Install System Team Uploaders: Christian Perrier Build-Depends: debhelper (>= 9), po-debconf -Vcs-Browser: https://anonscm.debian.org/cgit/d-i/clock-setup.git -Vcs-Git: https://anonscm.debian.org/git/d-i/clock-setup.git +XS-Debian-Vcs-Browser: https://anonscm.debian.org/cgit/d-i/clock-setup.git +XS-Debian-Vcs-Git: https://anonscm.debian.org/git/d-i/clock-setup.git +Vcs-Bzr: http://bazaar.launchpad.net/~ubuntu-core-dev/clock-setup/ubuntu Package: clock-setup Architecture: any diff -pruN 0.131/finish-install.d/10clock-setup 0.131ubuntu1/finish-install.d/10clock-setup --- 0.131/finish-install.d/10clock-setup 2016-01-21 04:00:53.000000000 +0000 +++ 0.131ubuntu1/finish-install.d/10clock-setup 2017-01-30 21:13:34.000000000 +0000 @@ -82,7 +82,10 @@ else if [ -z "$probed" ]; then # installing the only OS, so use UTC db_set clock-setup/utc true - pri=low + db_get clock-setup/utc-auto + if [ "$RET" = true ]; then + pri=low + fi fi fi @@ -96,13 +99,17 @@ utcfile=/target/etc/default/rcS db_get clock-setup/utc if [ "$RET" = true ]; then - sed -i -e 's:^UTC="no":UTC="yes":' -e 's:^UTC=no:UTC=yes:' $utcfile + if [ -e "$utcfile" ]; then + sed -i -e 's:^UTC="no":UTC="yes":' -e 's:^UTC=no:UTC=yes:' $utcfile + fi if [ -e /target/etc/adjtime ]; then sed -i -e 's:^LOCAL$:UTC:' /target/etc/adjtime fi OPT="--utc" else - sed -i -e 's:^UTC="yes":UTC="no":' -e 's:^UTC=yes:UTC=no:' $utcfile + if [ -e "$utcfile" ]; then + sed -i -e 's:^UTC="yes":UTC="no":' -e 's:^UTC=yes:UTC=no:' $utcfile + fi if [ -e /target/etc/adjtime ]; then sed -i -e 's:^UTC$:LOCAL:' /target/etc/adjtime fi @@ -117,7 +124,7 @@ if [ "$RET" = true ]; then hwclock_prepare db_progress INFO clock-setup/progress/hwclock - log-output -t clock-setup chroot /target hwclock $OPT --systohc --debug & + log-output -t clock-setup chroot /target hwclock $OPT --systohc --debug --noadjfile & pid="$!" count=0