[patch] CLOCK_HCTOSYS option to /etc/conf.d/clock and handling through /etc/init.d/clock

kernel_hctosys.patch (text/plain), 1.55 KB, created by Dimitris Mandalidis on 2009-06-06 13:16:42 UTC

diff -Naur baselayout-1.12.11.1-old/etc/conf.d/clock baselayout-1.12.11.1-new/etc/conf.d/clock
--- baselayout-1.12.11.1-old/etc/conf.d/clock	2007-10-24 01:59:26.000000000 +0300
+++ baselayout-1.12.11.1-new/etc/conf.d/clock	2009-06-06 15:56:18.000000000 +0300
@@ -24,6 +24,10 @@
 
 CLOCK_SYSTOHC="no"
 
+# If you want to set the System Time to the Hardware Clock during bootup. Note that
+# with newer kernels this is handled through CONFIG_RTC_HCTOSYS kernel option. 
+
+CLOCK_HCTOSYS="yes"
 
 ### ALPHA SPECIFIC OPTIONS ###
 
diff -Naur baselayout-1.12.11.1-old/init.d/clock baselayout-1.12.11.1-new/init.d/clock
--- baselayout-1.12.11.1-old/init.d/clock	2008-01-14 10:42:38.000000000 +0200
+++ baselayout-1.12.11.1-new/init.d/clock	2009-06-06 16:06:38.000000000 +0300
@@ -82,14 +82,19 @@
 		modprobe rtc &> /dev/null || modprobe genrtc &> /dev/null
 	fi
 
-	ebegin "Setting system clock using the hardware clock [${TBLURB}]"
 	if [[ ${fakeit} -eq 1 ]] ; then
 		ret=0
 
 	elif [[ -x /sbin/hwclock ]] ; then
 		# Since hwclock always exit's with a 0, need to check its output.
 		errstr=$(/sbin/hwclock ${myadj} ${myopts} 2>&1 >/dev/null)
-		errstr="${errstr}$(/sbin/hwclock --hctosys ${myopts} 2>&1 >/dev/null)"
+		if [[ ${CLOCK_HCTOSYS} != "yes" ]] ; then
+			ebegin "Setting timezone [${TBLURB}]"
+			errstr="${errstr}$(/sbin/hwclock --systz ${myopts} 2>&1 >/dev/null)"
+		else
+			ebegin "Setting system clock using the hardware clock [${TBLURB}]"
+			errstr="${errstr}$(/sbin/hwclock --hctosys ${myopts} 2>&1 >/dev/null)"
+		fi
 
 		if [[ -n ${errstr} ]] ; then
 			ewarn "${errstr}"