From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from pigeon.gentoo.org ([208.92.234.80] helo=lists.gentoo.org) by finch.gentoo.org with esmtp (Exim 4.60) (envelope-from ) id 1PnOvm-00079s-1G for garchives@archives.gentoo.org; Thu, 10 Feb 2011 05:19:02 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 886811C002; Thu, 10 Feb 2011 05:18:54 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id 5BD111C002 for ; Thu, 10 Feb 2011 05:18:54 +0000 (UTC) Received: from pelican.gentoo.org (unknown [66.219.59.40]) (using TLSv1 with cipher ADH-CAMELLIA256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id E50EE1B4310 for ; Thu, 10 Feb 2011 05:18:53 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by pelican.gentoo.org (Postfix) with ESMTP id 1C72D8006A for ; Thu, 10 Feb 2011 05:18:53 +0000 (UTC) From: "William Hubbs" To: gentoo-commits@lists.gentoo.org Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "William Hubbs" Message-ID: Subject: [gentoo-commits] proj/openrc:master commit in: init.d/ X-VCS-Repository: proj/openrc X-VCS-Files: init.d/hwclock.in X-VCS-Directories: init.d/ X-VCS-Committer: williamH X-VCS-Committer-Name: William Hubbs X-VCS-Revision: ebd79394a31d40c72d7f96a1cb832d1130777537 Date: Thu, 10 Feb 2011 05:18:53 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: quoted-printable X-Archives-Salt: X-Archives-Hash: f057d2b2768fc35bc5d9560667da6965 commit: ebd79394a31d40c72d7f96a1cb832d1130777537 Author: William Hubbs gmail com> AuthorDate: Mon Feb 7 16:29:38 2011 +0000 Commit: William Hubbs gentoo org> CommitDate: Thu Feb 10 05:15:24 2011 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=3Dproj/openrc.git;a=3D= commit;h=3Debd79394 set timezone if RC_HCTOSYS is not set We need to set the timezone for the system clock even when we allow the kernel to set the time. X-Gentoo-Bug: 248131 X-Gentoo-Bug-URL: http://bugs.gentoo.org/show_bug.cgi?id=3D248131 --- init.d/hwclock.in | 7 +++++-- 1 files changed, 5 insertions(+), 2 deletions(-) diff --git a/init.d/hwclock.in b/init.d/hwclock.in index 040d84a..f673d35 100644 --- a/init.d/hwclock.in +++ b/init.d/hwclock.in @@ -64,7 +64,6 @@ _hwclock() =20 start() { - yesno $clock_hctosys || return 0 local retval=3D0 errstr=3D"" setupopts =20 @@ -95,7 +94,11 @@ start() "$utc_cmd}" !=3D --utc -o \ -n "$clock_args" ]; then - _hwclock --hctosys $utc_cmd $clock_args + if yesno $clock_hctosys; then + _hwclock --hctosys $utc_cmd $clock_args + else + _hwclock --systz $utc_cmd $clock_args + fi retval=3D$(($retval + $?)) fi =20