checkbootparam utc >>$DEBUG 2>&1 && UTC="-u"
checkbootparam gmt >>$DEBUG 2>&1 && UTC="-u"
# hwclock uses the TZ variable
- export TZ
- hwclock $UTC -s
+ if [ -r /etc/default/locale ] ; then
+ . /etc/default/locale
+ else
+ TZ=Europe/Vienna
+ fi
+ ERROR=$(TZ="$TZ" hwclock $UTC -s 2>&1) ; RC=$?
+ if [ -n "$ERROR" ] ; then
+ eindent
+ ERROR=$(TZ="$TZ" hwclock $UTC -s --directisa 2>&1)
+ if [ -n "$ERROR" ] ; then
+ eerror "Problem running hwclock: $ERROR" ; eend 1
+ fi
+ eoutdent
+ fi
fi
}
# }}}
case "$f" in swap)
eindent
if [ -n "$NOSWAP" ]; then
- ewarn "Ignoring swap partition ${WHITE}$p${NORMAL}. (Force usage via boot option 'swap', or execute grml-swapon)" ; eend 0
+ if [ -z "$INSTALLED" ] ; then
+ ewarn "Ignoring swap partition ${WHITE}$p${NORMAL}. (Force usage via boot option 'swap', or execute grml-swapon)" ; eend 0
+ fi
else
case "$(dd if=$p bs=1 count=6 skip=4086 2>/dev/null)" in
S1SUSP|S2SUSP|pmdisk|[zZ]*)
if ! checkbootparam 'swraid' ; then
eindent
- einfo "Just run 'Start mdadm-raid' to assemble md arrays or boot using swraid bootoption for autostart."
+ einfo "Just run 'Start mdadm-raid' to assemble md arrays or boot using 'swraid' as bootoption for autostart."
eoutdent
else
einfo "Bootoption swraid found. Searching for software RAID arrays:"