From: Michael Prokop <mika@grml.org>
Date: Wed, 26 Sep 2012 17:41:00 +0000 (+0200)
Subject: Source /etc/grml/grml-live.conf only if it can be read
X-Git-Tag: v0.19.8~4
X-Git-Url: http://git.grml.org/?p=grml-live.git;a=commitdiff_plain;h=9c4a6913833f105dc6581fc7aa9f737714aa9686

Source /etc/grml/grml-live.conf only if it can be read

We no longer depend on the file /etc/grml/grml-live.conf as
we keep system defaults in the program nowadays, so do not
fail if file can not be read.

Thanks: Evgeni Golov for reporting
---

diff --git a/grml-live b/grml-live
index 4a68301..a7db0d8 100755
--- a/grml-live
+++ b/grml-live
@@ -147,7 +147,14 @@ fi
 
 # source main configuration file:
 LIVE_CONF=/etc/grml/grml-live.conf
-. $LIVE_CONF
+if ! [ -r "$LIVE_CONF" ] ; then
+  log "Confuguration file $LIVE_CONF can not be read, ignoring"
+else
+  log   "Sourcing configuration file $LIVE_CONF"
+  einfo "Sourcing configuration file $LIVE_CONF"
+  . $LIVE_CONF
+  eend $?
+fi
 # }}}
 
 # umount all directories {{{