Attachment #193721 for bug #248131

View | Details | Raw Unified | Return to bug 248131
Collapse All | Expand All

Lines 24-29 Link Here

(-)baselayout-1.12.11.1-old/etc/conf.d/clock (+4 lines)
24		24
25	CLOCK_SYSTOHC="no"	25	CLOCK_SYSTOHC="no"
26		26
		27	# If you want to set the System Time to the Hardware Clock during bootup. Note that
		28	# with newer kernels this is handled through CONFIG_RTC_HCTOSYS kernel option.
		29
		30	CLOCK_HCTOSYS="yes"
27		31
28	### ALPHA SPECIFIC OPTIONS ###	32	### ALPHA SPECIFIC OPTIONS ###
29		33




		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)
		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}"

Return to bug 248131

Lines 82-95 Link Here

(-)baselayout-1.12.11.1-old/init.d/clock (-2 / +7 lines)
82	modprobe rtc &> /dev/null \|\| modprobe genrtc &> /dev/null	82	modprobe rtc &> /dev/null \|\| modprobe genrtc &> /dev/null
83	fi	83	fi
84		84
85	ebegin "Setting system clock using the hardware clock [${TBLURB}]"
86	if [[ ${fakeit} -eq 1 ]] ; then	85	if [[ ${fakeit} -eq 1 ]] ; then
87	ret=0	86	ret=0
88		87
89	elif [[ -x /sbin/hwclock ]] ; then	88	elif [[ -x /sbin/hwclock ]] ; then
90	# Since hwclock always exit's with a 0, need to check its output.	89	# Since hwclock always exit's with a 0, need to check its output.
91	errstr=$(/sbin/hwclock ${myadj} ${myopts} 2>&1 >/dev/null)	90	errstr=$(/sbin/hwclock ${myadj} ${myopts} 2>&1 >/dev/null)
92	errstr="${errstr}$(/sbin/hwclock --hctosys ${myopts} 2>&1 >/dev/null)"	91	if [[ ${CLOCK_HCTOSYS} != "yes" ]] ; then
		92	ebegin "Setting timezone [${TBLURB}]"
		93	errstr="${errstr}$(/sbin/hwclock --systz ${myopts} 2>&1 >/dev/null)"
		94	else
		95	ebegin "Setting system clock using the hardware clock [${TBLURB}]"
		96	errstr="${errstr}$(/sbin/hwclock --hctosys ${myopts} 2>&1 >/dev/null)"
		97	fi
93		98
94	if [[ -n ${errstr} ]] ; then	99	if [[ -n ${errstr} ]] ; then
95	ewarn "${errstr}"	100	ewarn "${errstr}"