-
Committer:
Bazaar Package Importer
-
Author(s):
Colin Watson
-
Date:
2010-08-01 17:07:00 UTC
-
mfrom:
(1.1.7 sid)
-
Revision ID:
james.westby@ubuntu.com-20100801170700-hmsykmbhuocs8pa0
Tags: 0.103ubuntu1
* 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.