Instead of mirroring correct output, state that we're not running because of RC_SYS.
This commit is contained in:
parent
455a9105a8
commit
3be23bc02d
@ -79,8 +79,12 @@ start() {
|
|||||||
local retval=0 errstr=""
|
local retval=0 errstr=""
|
||||||
setupopts
|
setupopts
|
||||||
|
|
||||||
|
if [ -z "${utc_cmd}" ]; then
|
||||||
|
ewarn "Not setting clock for ${utc} system"
|
||||||
|
return 0
|
||||||
|
fi
|
||||||
|
|
||||||
ebegin "Setting system clock using the hardware clock [${utc}]"
|
ebegin "Setting system clock using the hardware clock [${utc}]"
|
||||||
if [ -n "${utc_cmd}" ]; then
|
|
||||||
if [ -e /proc/modules -a ! -e /dev/rtc ]; then
|
if [ -e /proc/modules -a ! -e /dev/rtc ]; then
|
||||||
modprobe -q rtc || modprobe -q genrtc
|
modprobe -q rtc || modprobe -q genrtc
|
||||||
fi
|
fi
|
||||||
@ -94,7 +98,7 @@ start() {
|
|||||||
if [ "${PREVLEVEL}" != "N" -o "${utc_cmd}" != "--utc" -o -n "${clock_args}" ]; then
|
if [ "${PREVLEVEL}" != "N" -o "${utc_cmd}" != "--utc" -o -n "${clock_args}" ]; then
|
||||||
errstr="${errstr}$(hwclock --hctosys ${utc_cmd} ${clock_args} 2>&1 >/dev/null)"
|
errstr="${errstr}$(hwclock --hctosys ${utc_cmd} ${clock_args} 2>&1 >/dev/null)"
|
||||||
fi
|
fi
|
||||||
fi
|
|
||||||
if [ -n "${errstr}" ]; then
|
if [ -n "${errstr}" ]; then
|
||||||
ewarn "${errstr}"
|
ewarn "${errstr}"
|
||||||
retval=1
|
retval=1
|
||||||
@ -113,8 +117,9 @@ stop() {
|
|||||||
local retval=0 errstr=""
|
local retval=0 errstr=""
|
||||||
setupopts
|
setupopts
|
||||||
|
|
||||||
|
[ -z "${utc_cmd}" ] && return 0
|
||||||
|
|
||||||
ebegin "Setting hardware clock using the system clock" "[${utc}]"
|
ebegin "Setting hardware clock using the system clock" "[${utc}]"
|
||||||
if [ -n "${utc_cmd}" ]; then
|
|
||||||
if ! yesno "${clock_adjfile}"; then
|
if ! yesno "${clock_adjfile}"; then
|
||||||
# Some implementations don't handle adjustments
|
# Some implementations don't handle adjustments
|
||||||
if LC_ALL=C hwclock --help | grep -q "\-\-noadjfile"; then
|
if LC_ALL=C hwclock --help | grep -q "\-\-noadjfile"; then
|
||||||
@ -122,7 +127,6 @@ stop() {
|
|||||||
fi
|
fi
|
||||||
fi
|
fi
|
||||||
errstr="$(LC_ALL=C hwclock --systohc ${utc_cmd} ${clock_args} 2>&1 >/dev/null)"
|
errstr="$(LC_ALL=C hwclock --systohc ${utc_cmd} ${clock_args} 2>&1 >/dev/null)"
|
||||||
fi
|
|
||||||
if [ -n "${errstr}" ]; then
|
if [ -n "${errstr}" ]; then
|
||||||
ewarn "${errstr}"
|
ewarn "${errstr}"
|
||||||
retval=1
|
retval=1
|
||||||
|
@ -36,7 +36,10 @@ start() {
|
|||||||
rm -rf "${RC_LIBDIR}"/console
|
rm -rf "${RC_LIBDIR}"/console
|
||||||
|
|
||||||
case "${RC_SYS}" in
|
case "${RC_SYS}" in
|
||||||
UML|VPS|XENU) return 0;;
|
UML|VPS|XENU)
|
||||||
|
ewarn "Not loading consolefont for ${RC_SYS} systems"
|
||||||
|
return 0
|
||||||
|
;;
|
||||||
esac
|
esac
|
||||||
|
|
||||||
ttyn=${rc_tty_number:-${RC_TTY_NUMBER:-12}}
|
ttyn=${rc_tty_number:-${RC_TTY_NUMBER:-12}}
|
||||||
|
@ -40,8 +40,7 @@ depend() {
|
|||||||
start() {
|
start() {
|
||||||
case "${RC_SYS}" in
|
case "${RC_SYS}" in
|
||||||
UML|VPS|XENU)
|
UML|VPS|XENU)
|
||||||
ebegin "Loading key mappings"
|
ewarn "Not loading keymaps for ${RC_SYS} systems"
|
||||||
eend 0
|
|
||||||
return 0
|
return 0
|
||||||
;;
|
;;
|
||||||
esac
|
esac
|
||||||
|
Loading…
Reference in New Issue
Block a user