From 9bb58dc271a33919c9a7513335dcaa373da489a5 Mon Sep 17 00:00:00 2001 From: Michael Prokop Date: Sun, 3 Dec 2006 22:57:42 +0100 Subject: [PATCH 1/1] * config_time: make sure /etc/default/locale can be accessed before reading it (relevant basically only for booting via PXE). --- autoconfig.functions | 6 +++++- debian/changelog | 7 +++++++ 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/autoconfig.functions b/autoconfig.functions index 5c8e087..1ea5608 100755 --- a/autoconfig.functions +++ b/autoconfig.functions @@ -335,7 +335,11 @@ config_time(){ checkbootparam utc >>$DEBUG 2>&1 && UTC="-u" checkbootparam gmt >>$DEBUG 2>&1 && UTC="-u" # hwclock uses the TZ variable - . /etc/default/locale + 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 diff --git a/debian/changelog b/debian/changelog index a7ee4b1..f7e8aac 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +grml-autoconfig (0.6-8) unstable; urgency=low + + * config_time: make sure /etc/default/locale can be accessed + before reading it (relevant basically only for booting via PXE). + + -- Michael Prokop Sun, 3 Dec 2006 22:56:58 +0100 + grml-autoconfig (0.6-7) unstable; urgency=low * config_time: use option --directisa for hwclock if running hwclock -- 2.1.4