Don't warn about Factory clock when booting off of livecd.

2007-05-31 05:51:00 +00:00
parent 27344f7f27
commit 230e3f2afe
2 changed files with 5 additions and 1 deletions
--- 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
 }