[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

Bug#660093: marked as done (clock-setup: Please support /etc/adjtime in addition to /etc/default)

Your message dated Mon, 21 May 2012 21:24:01 +0000
with message-id <E1SWa5B-0000Q1-Tq@franck.debian.org>
and subject line Bug#660093: fixed in clock-setup 0.111
has caused the Debian Bug report #660093,
regarding clock-setup: Please support /etc/adjtime in addition to /etc/default
to be marked as done.

This means that you claim that the problem has been dealt with.
If this is not the case it is now your responsibility to reopen the
Bug report if necessary, and/or fix the problem forthwith.

(NB: If you are a system administrator and have no idea what this
message is talking about, this may indicate a serious mail system
misconfiguration somewhere. Please contact owner@bugs.debian.org
immediately.)


-- 
660093: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=660093
Debian Bug Tracking System
Contact owner@bugs.debian.org with problems
--- Begin Message --- 
Package: clock-setup
Version: 0.110
Severity: normal
Tags: patch

Hi,

This is similar to the patch for hwclock support last week, but
solves a different problem, namely supporting systemd in d-i,
and (potentially) allowing migration of the UTC setting in
/etc/default into the native configuration file for this option.


Many thanks,
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 8ca1790120e851c34e5dffa7adb20322ef6c970a Mon Sep 17 00:00:00 2001
From: Roger Leigh <rleigh@debian.org>
Date: Thu, 16 Feb 2012 10:41:03 +0000
Subject: [PATCH] 10clock-setup: Support /etc/adjtime

Set UTC or LOCAL in /etc/adjtime in addition to UTC= in /etc/default.
This is because /etc/adjtime is the configuration file for hwclock,
and the systemd init daemon uses the configuration file directly,
thus this change makes it possible for d-i to support installations
which use systemd in place of sysvinit.  This change does not affect
sysvinit users, because /etc/adjtime is updated when hwclock is run.
---
 finish-install.d/10clock-setup |    6 ++++++
 1 files changed, 6 insertions(+), 0 deletions(-)

diff --git a/finish-install.d/10clock-setup b/finish-install.d/10clock-setup
index 4bde2c4..4e52af5 100755
--- a/finish-install.d/10clock-setup
+++ b/finish-install.d/10clock-setup
@@ -101,9 +101,15 @@ fi
 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 /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 /target/etc/adjtime ]; then
+		sed -i -e 's:^UTC$:LOCAL:' /target/etc/adjtime
+	fi
 	OPT="--localtime"
 fi
 
-- 
1.7.9

--- End Message ---
--- Begin Message --- 
Source: clock-setup
Source-Version: 0.111

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.111.dsc
  to main/c/clock-setup/clock-setup_0.111.dsc
clock-setup_0.111.tar.gz
  to main/c/clock-setup/clock-setup_0.111.tar.gz
clock-setup_0.111_i386.udeb
  to main/c/clock-setup/clock-setup_0.111_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 660093@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: Mon, 21 May 2012 16:26:35 -0400
Source: clock-setup
Binary: clock-setup
Architecture: source i386
Version: 0.111
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: 660093
Changes: 
 clock-setup (0.111) unstable; urgency=low
 .
   [ Samuel Thibault ]
   * Pass --directisa to hwlock on hurd.
 .
   [ Roger Leigh ]
   * Set UTC or LOCAL in /etc/adjtime for systemd. Closes: #660093
   * Migrate UTC setting from /etc/default/rcS; revert use of
     /etc/default/hwclock, which is not used for holding the UTC
     setting.
 .
   [ Updated translations ]
   * Bulgarian (bg.po) by Damyan Ivanov
   * Tibetan (bo.po) by Tennom
   * Estonian (et.po) by Mattias Põldaru
   * Basque (eu.po) by Piarres Beobide
   * Indonesian (id.po) by Mahyuddin Susanto
   * Macedonian (mk.po) by Arangel Angov
   * Panjabi (pa.po) by A S Alam
   * Traditional Chinese (zh_TW.po) by Yao Wei (魏銘廷)
Checksums-Sha1: 
 64cdbaa5be07da2bd8528332339f04f191d95c29 1576 clock-setup_0.111.dsc
 c1a34fc2cbe02cbc13894c6506eb6dd03209fb44 85947 clock-setup_0.111.tar.gz
 edd230e552d7ccd3c8b3a423f89b73a1f61b7642 61124 clock-setup_0.111_i386.udeb
Checksums-Sha256: 
 437ea04237311ddba59dceb213f097e32eb72081f855b5d402dd2502cbe5f5a4 1576 clock-setup_0.111.dsc
 ab1cbcabb11bc6bbe49fdb6f9ed1969c426bd1e7e5a40c1a57eb41350ad13f1f 85947 clock-setup_0.111.tar.gz
 ad6c311d9001aff6752f43218bc62f16689c9b0a91613770c6e33f23b6247f6a 61124 clock-setup_0.111_i386.udeb
Files: 
 e9f5debf31674028f96a239e0825da2d 1576 debian-installer standard clock-setup_0.111.dsc
 3d716f40cece632bfb154ae06ef88c3d 85947 debian-installer standard clock-setup_0.111.tar.gz
 eb1816409c86fd1de21650749d1d53a9 61124 debian-installer standard clock-setup_0.111_i386.udeb
Package-Type: udeb

-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.12 (GNU/Linux)

iQIVAwUBT7ql0ckQ2SIlEuPHAQg2lhAAoIB+Ine9vE5Y/qtwnS9yU25wMzN+vD0W
OCw+py4UJwDRseUJxAu/1lKpeLL7R4lbKbeX1Ue39qaXjBDYJmMdHAWKVfHQDLgm
K/IXxwZl6pE8VTPGH9EEz9z5dN7mB7oABVH8VBBzyIupZt6qyfzU0ayQ2gQ1/S1C
8JnSi+KzMD3SI19L5ugIADmSuQIxXB9wlvpZCM1/xJni12RpAFZ4iqSX7gYcHTI7
tM/zTU/erQfBfO7QPVj2Z4TO/fCmY2uuAfacqwyyKxueNS6qqdZaLuSAY+w8Wecd
dvGKKHcB0a8uU97PE7ei5JJ0XsTf1exk+/CzBC9cCHPZqfmfrrbfi+/D5vF1reqM
GhtJcY0PczfNkLxxMBq0mNwPon0j7hXjbi9JNxHLBiu2rdP62NMy24hLQm1AcrNr
t2maRk4fpAJnC0oV34rxjjPEW0XWR29A5iHm85dj62r1yC0Whn/FXNCG31SKio2/
yl8Ey7/mN2Oh6OU491j+48mfG99DGHf5enCQLpXwNZu4uxmoSjwcKgcNR2vJuXsI
8SsJEfVb8LWRC/O56+ZP7x6lOEPclUD2Z1z02/c/hpG6K0PuMLlj3gVJKVQaV75E
g04h6MEWnlX9pKLE03t17fAsV9P8fGBaQXiIXSpmMEVGLpNTJRzeGshjMLdUZE3y
S28dKjPyBp0=
=nBjp
-----END PGP SIGNATURE-----

--- End Message ---
Reply to: