--- Begin Message ---
Package: clock-setup
Version: 0.109
Severity: important
Tags: patch
Hi,
In order to resolve bugs including #659451 and permit
/etc/default/rcS to become a regular conffile, I'd like to
move the UTC variable from /etc/default/rcS to
/etc/default/hwclock. This would require clock-setup to
be patched before this can be fixed in initscripts, to
avoid breakage. A patch is attached which makes clock-setup
use /etc/default/hwclock, but fall back to /etc/default/rcS
for backward compatibility if not present. I'd appreciate
it if you would consider applying it.
Regards,
Roger
-- System Information:
Debian Release: wheezy/sid
APT prefers unstable
APT policy: (550, 'unstable'), (500, 'testing'), (400, 'experimental')
Architecture: amd64 (x86_64)
Kernel: Linux 3.2.0-1-amd64 (SMP w/4 CPU cores)
Locale: LANG=en_GB.UTF-8, LC_CTYPE=en_GB.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash
>From a3878e9c14e4283a43afd34cefbf88e8fa36fa2f Mon Sep 17 00:00:00 2001
From: Roger Leigh <rleigh@debian.org>
Date: Sun, 12 Feb 2012 14:41:59 +0000
Subject: [PATCH] 10clock-setup: Support /etc/default/hwclock
/etc/default/hwclock supersedes /etc/default/rcS as the location
for the UTC configuration option. Use /etc/default/hwclock, but
fall back to /etc/default/rcS if it is not present, for backward
compatibility.
---
finish-install.d/10clock-setup | 10 +++++++---
1 files changed, 7 insertions(+), 3 deletions(-)
diff --git a/finish-install.d/10clock-setup b/finish-install.d/10clock-setup
index f825bb8..c80f1dd 100755
--- a/finish-install.d/10clock-setup
+++ b/finish-install.d/10clock-setup
@@ -92,14 +92,18 @@ if ! db_go; then
fi
# Update target system configuration for utc/localtime selection
-rcsfile=/target/etc/default/rcS
+if [ -f /target/etc/default/hwclock ]; then
+ utcfile=/target/etc/default/hwclock
+else
+ utcfile=/target/etc/default/rcS
+fi
db_get clock-setup/utc
if [ "$RET" = true ]; then
- sed -i -e 's:^UTC="no":UTC="yes":' -e 's:^UTC=no:UTC=yes:' $rcsfile
+ sed -i -e 's:^UTC="no":UTC="yes":' -e 's:^UTC=no:UTC=yes:' $utcfile
OPT="--utc"
else
- sed -i -e 's:^UTC="yes":UTC="no":' -e 's:^UTC=yes:UTC=no:' $rcsfile
+ sed -i -e 's:^UTC="yes":UTC="no":' -e 's:^UTC=yes:UTC=no:' $utcfile
OPT="--localtime"
fi
--
1.7.9
--- End Message ---
--- Begin Message ---
Source: clock-setup
Source-Version: 0.110
We believe that the bug you reported is fixed in the latest version of
clock-setup, which is due to be installed in the Debian FTP archive:
clock-setup_0.110.dsc
to main/c/clock-setup/clock-setup_0.110.dsc
clock-setup_0.110.tar.gz
to main/c/clock-setup/clock-setup_0.110.tar.gz
clock-setup_0.110_i386.udeb
to main/c/clock-setup/clock-setup_0.110_i386.udeb
A summary of the changes between this version and the previous one is
attached.
Thank you for reporting the bug, which will now be closed. If you
have further comments please address them to 659611@bugs.debian.org,
and the maintainer will reopen the bug report if appropriate.
Debian distribution maintenance software
pp.
Joey Hess <joeyh@debian.org> (supplier of updated clock-setup package)
(This message was generated automatically at their request; if you
believe that there is a problem with it please contact the archive
administrators by mailing ftpmaster@debian.org)
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA256
Format: 1.8
Date: Sun, 12 Feb 2012 15:28:20 -0400
Source: clock-setup
Binary: clock-setup
Architecture: source i386
Version: 0.110
Distribution: unstable
Urgency: low
Maintainer: Debian Install System Team <debian-boot@lists.debian.org>
Changed-By: Joey Hess <joeyh@debian.org>
Description:
clock-setup - set up clock (udeb)
Closes: 659611
Changes:
clock-setup (0.110) unstable; urgency=low
.
* /etc/default/hwclock supersedes /etc/default/rcS as the location
for the UTC configuration option. Use /etc/default/hwclock, but
fall back to /etc/default/rcS if it is not present, for backward
compatibility. (Roger Leigh) Closes: #659611
Checksums-Sha1:
8e9108f550ad6ef669f713d86551e3a8fe2ab230 1576 clock-setup_0.110.dsc
dcfc5e524cb06e0149b164f4660078e6e231299f 84080 clock-setup_0.110.tar.gz
22b0e52377250fcda5546eff014965efb67b2fc8 60396 clock-setup_0.110_i386.udeb
Checksums-Sha256:
0286aaf9ef0ee025fa59d7ad874bcdca19fce574f73f0c23e4f9ae334a97f354 1576 clock-setup_0.110.dsc
db74abe44a9ee1cabb05e86aa290b1b4df9b044ddf8b8b7d0009dd868efeb3cd 84080 clock-setup_0.110.tar.gz
9de36f3cf83738ec8d82ed44ab90e991c36e7e63e427234114b2c24a823d425a 60396 clock-setup_0.110_i386.udeb
Files:
2627e2e8d8f1eee65e5c90e0189ec496 1576 debian-installer standard clock-setup_0.110.dsc
a8945e8dc6be241537a973ea7bb70b73 84080 debian-installer standard clock-setup_0.110.tar.gz
36907610244fc1a81c92aac84d1e8ba3 60396 debian-installer standard clock-setup_0.110_i386.udeb
Package-Type: udeb
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.11 (GNU/Linux)
iQIVAwUBTzgS/MkQ2SIlEuPHAQi+1A/9GBsKaxGq3nbd8cBsHfitDqef2wGFyTJf
DcbVNyU1cAg6QbrdrDsn2hoHN6gZqiqBX3vhlnijoge5Ksi2UnAuGTwTGJm2uFlE
qT19eTAFXnk35X64EvEtggWx4M9Q25+OHza7lGSu1LOHt7TL//2NCD/Oiaq1A0TJ
i+OQaKKGpsXLnwpu0LRslEq0kuNUHh9JLKI7PbfaY9iincoG4ILM79KoNYFY/pjw
C/vygBIghPVx9QdLGRKikbftMa/6al2/l1/RIAojMcJvEFZ9YoOnv2SjRJhImFHc
ugKGL3XX5RA7YdImmFZrxMWAC6YGG0aEVos1KG7whtHd55Y4PmDGzxsHLIOEARTV
hE9APeRGspzOto5n/6fw1sHM5HpeBLsJ1janb1ixwOqf9zXbepdUpgVbZmHbsayn
pmLFr217K3ZUX0XrdxEhVU+hr7WZEpdSDq7jtpI4GlAQjnKeUhzrcdGvzNbqUloO
n35H4JHct38XBmhUn5gHCQFT3YXEI/u8dAC2f8OO0NwXJ6PHJXi9AlKWLYNzF3Si
u+P5Xbkag5EwacYkZn+X1kH9WgfwQFjyojPOms3lec50+FxmkgMTFRP375+14UYS
AtPYxYhe4uboLXeGj9J1t86DLBnF4e2V0e2ZmvhqyEjrA/Z7oqPxHGGgr1mWNOHs
fs6i4Z+p7Nk=
=lytX
-----END PGP SIGNATURE-----
--- End Message ---