From 230e3f2afe9470980e42e211af9192645d1cd088 Mon Sep 17 00:00:00 2001
From: Mike Frysinger <vapier@gentoo.org>
Date: Thu, 31 May 2007 05:51:00 +0000
Subject: Don't warn about Factory clock when booting off of livecd.
---
ChangeLog | 4 ++++
init.d.Linux/clock | 2 +-
2 files changed, 5 insertions(+), 1 deletion(-)
diff --git a/ChangeLog b/ChangeLog
index 66becc09..92711265 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for Gentoo System Intialization ("rc") scripts
# Copyright 1999-2007 Gentoo Foundation; Distributed under the GPLv2
+ 31 May 2007; Mike Frysinger <vapier@gentoo.org>:
+
+ Don't warn about Factory clock when booting off of livecd.
+
30 May 2007; Roy Marples <uberlord@gentoo.org>:
Only call systohw in clock when we don't have adjfile or we aren't UTC.
diff --git a/init.d.Linux/clock b/init.d.Linux/clock
index 5c891322..640de577 100755
--- a/init.d.Linux/clock
+++ b/init.d.Linux/clock
@@ -59,7 +59,7 @@ setupopts() {
# Make sure people set their timezone ... we do it here
# even though we don't actually use the variable so that
# people see the warning on boot.
- if [ "${TIMEZONE-Factory}" = "Factory" ] ; then
+ if [ -z "${CDBOOT}" -a "${TIMEZONE-Factory}" = "Factory" ] ; then
ewarn "Your TIMEZONE in /etc/conf.d/clock is still set to Factory!"
fi
}
--
cgit v1.2.3