emo/openrc
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

clock init script now works with busybox.

Browse Source
This commit is contained in:
Roy Marples 2007-10-23 22:49:21 +00:00
parent f884223388
commit 663f21199a
2 changed files with 46 additions and 57 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
ChangeLog
View File

@ -3,6 +3,7 @@
23 Oct 2007; Roy Marples <uberlord@gentoo.org>: 23 Oct 2007; Roy Marples <uberlord@gentoo.org>:
clock init script now works with busybox hwclock.
clock init script now handles /etc/adjtime correctly. clock init script now handles /etc/adjtime correctly.
CLOCK_ADJTIME hinted that it could change the location of /etc/adjtime. CLOCK_ADJTIME hinted that it could change the location of /etc/adjtime.
This is not the case. This is not the case.

102
init.d.Linux/clock
View File

@ -8,54 +8,43 @@ description="Sets the local clock to UTC or Local Time."
description_save="Saves the current time in the BIOS." description_save="Saves the current time in the BIOS."
depend() { depend() {
case "${CLOCK_ADJTIME}" in if [ "${CLOCK_ADJFILE}" = "yes" ]; then
""|no) before *;; use checkroot
/etc/*|yes) need checkroot;; else
*) need localmount;; before *
esac fi
} }
setupopts() { setupopts() {
myopts= hwclock_opts=
case "${CLOCK_ADJTIME}" in
no) CLOCK_ADJTIME=;;
yes) CLOCK_ADJTIME="/etc/adjtime";;
esac
case "${RC_SYS}" in case "${RC_SYS}" in
UML|VPS|XEN) UML|VPS|XEN)
TBLURB="${RC_SYS}" TBLURB="${RC_SYS}"
fakeit=1
;; ;;
*) *)
case "$(uname -m)" in case "$(uname -m)" in
s390*) s390*)
TBLURB="s390" TBLURB="s390"
fakeit=1
;; ;;
*) *)
if [ -e /proc/devices ] && grep -q " cobd$" /proc/devices ; then if [ -e /proc/devices ] && grep -q " cobd$" /proc/devices ; then
TBLURB="coLinux" TBLURB="coLinux"
fakeit=1
elif [ "${CLOCK}" = "UTC" ] ; then elif [ "${CLOCK}" = "UTC" ] ; then
myopts="--utc" hwclock_opts="--utc"
TBLURB="UTC" TBLURB="UTC"
else else
myopts="--localtime" hwclock_opts="--localtime"
TBLURB="Local Time" TBLURB="Local Time"
fi fi
;; ;;
esac esac
;; ;;
esac esac
[ ${fakeit} -eq 1 ] && return 0 [ -n "${hwclock_opts}" ] || return 0
[ -w /etc -a -n "${CLOCK_ADJTIME}" ] || myopts="${myopts} --noadjfile" [ "${SRM}" = "yes" ] && hwclock_opts="${hwclock_opts} --srm"
[ "${ARC}" = "yes" ] && hwclock_opts="${hwclock_opts} --arc"
[ "${SRM}" = "yes" ] && myopts="${myopts} --srm" hwclock_opts="${hwclock_opts}${CLOCK_OPTS:+ }${CLOCK_OPTS}"
[ "${ARC}" = "arc" ] && myopts="${myopts} --arc"
myopts="${myopts} ${CLOCK_OPTS}"
# Make sure user isn't using rc.conf anymore. # Make sure user isn't using rc.conf anymore.
if [ -e /etc/rc.conf ] && \ if [ -e /etc/rc.conf ] && \
@ -72,33 +61,31 @@ setupopts() {
} }
start() { start() {
local myopts= myadj= TBLURB= fakeit=0 errstr="" retval=0 local hwclock_opts= TBLURB= errstr="" retval=0
setupopts setupopts
if [ ${fakeit} -ne 1 -a -e /proc/modules -a ! -e /dev/rtc ] ; then
modprobe -q rtc || modprobe -q genrtc
fi
ebegin "Setting system clock using the hardware clock [${TBLURB}]" ebegin "Setting system clock using the hardware clock [${TBLURB}]"
if [ ${fakeit} -eq 1 ] ; then if [ -n "${hwclock_opts}" ]; then
retval=0 if [ -e /proc/modules -a ! -e /dev/rtc ] ; then
elif [ -x /sbin/hwclock ] ; then modprobe -q rtc || modprobe -q genrtc
# Don't call hwclock unless we need to fi
if [ "${TBLURB}" != "UTC" -o "${myopts#*--noadjfile}" = "${myopts}" ] ; then
# Since hwclock always exit's with a 0, need to check its output. # Since hwclock always exit's with a 0, need to check its output.
[ -n "${CLOCK_ADJTIME}" ] && errstr="$(/sbin/hwclock --adjust 2>&1 >/dev/null)" if [ -e /etc/adjtime ] && [ "${CLOCK_ADJFILE}" = "yes" ]; then
errstr="${errstr}$(/sbin/hwclock --hctosys ${myopts} 2>&1 >/dev/null)" errstr="$(hwclock --adjust 2>&1 >/dev/null)"
if [ -n "${errstr}" ] ; then fi
ewarn "${errstr}" # If setting UTC, don't bother to run hwclock when first booting
retval=1 # as that's the default
fi if [ "${PREVLEVEL}" != "N" ] || [ "${hwclock_opts}" != "--utc" ]; then
errstr="Failed to set clock" errstr="${errstr}$(hwclock --hctosys ${hwclock_opts} 2>&1 >/dev/null)"
fi fi
else
retval=1
errstr="/sbin/hwclock not found"
fi fi
if [ -n "${errstr}" ]; then
ewarn "${errstr}"
retval=1
fi
errstr="Failed to set clock"
eend ${retval} "${errstr}" "You will need to set the clock yourself" eend ${retval} "${errstr}" "You will need to set the clock yourself"
return 0 return 0
@ -108,24 +95,25 @@ stop() {
# Don't tweak the hardware clock on LiveCD halt. # Don't tweak the hardware clock on LiveCD halt.
[ -n "${CDBOOT}" -o "${CLOCK_SYSTOHC}" != "yes" ] && return 0 [ -n "${CDBOOT}" -o "${CLOCK_SYSTOHC}" != "yes" ] && return 0
local myopts= myadj= TBLURB= fakeit=0 errstr="" retval=0 local hwclock_opts= TBLURB= errstr="" retval=0
setupopts setupopts
ebegin "Setting hardware clock using the system clock" "[${TBLURB}]" ebegin "Setting hardware clock using the system clock" "[${TBLURB}]"
if [ ${fakeit} -eq 1 ] ; then if [ -n "${hwclock_opts}" ]; then
retval=0 if [ "${CLOCK_ADJFILE}" != "yes" ]; then
elif [ -x /sbin/hwclock ] ; then # If we have adjtimex then we're probably busybox
errstr="$(LC_ALL=C /sbin/hwclock --systohc ${myopts} 2>&1 >/dev/null)" if ! type adjtimex >/dev/null 2>&1; then
if [ -n "${errstr}" ] ; then hwclock_opts="${hwclock_opts} --noadjfile"
ewarn "${errstr}" fi
retval=1
fi fi
errstr="Failed to sync clocks" errstr="$(LC_ALL=C hwclock --systohc ${hwclock_opts} 2>&1 >/dev/null)"
else
retval=1
errstr="hwclock not found"
fi fi
if [ -n "${errstr}" ] ; then
ewarn "${errstr}"
retval=1
fi
errstr="Failed to sync clocks"
eend ${retval} "${errstr}" eend ${retval} "${errstr}"
} }