[gentoo-commits] proj/openrc:master commit in: sh/

[William Hubbs]

commit:     27713e3a41574c20336fcbf4fd3522d126045f16
Author:     William Hubbs <williamh <AT> gentoo <DOT> org>
AuthorDate: Wed Nov  2 13:16:52 2011 +0000
Commit:     William Hubbs <williamh <AT> gentoo <DOT> org>
CommitDate: Wed Nov  2 13:31:43 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/openrc.git;a=commit;h=27713e3a

Make sure we load external scripts before using eerror

Reported-by: Jochen Schlick <josch06 <AT> gmail.com>
X-Gentoo-Bug: 388715
X-Gentoo-Bug-URL: http://bugs.gentoo.org/show_bug.cgi?id=388715

---
 sh/runscript.sh.in |   16 ++++++++--------
 1 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/sh/runscript.sh.in b/sh/runscript.sh.in
index 26dcfb3..010c794 100644
--- a/sh/runscript.sh.in
+++ b/sh/runscript.sh.in
@@ -33,6 +33,14 @@ loadconfig()
 	fi
 }
 
+sourcex "@SYSCONFDIR@/init.d/functions.sh"
+sourcex "@LIBEXECDIR@/sh/rc-functions.sh"
+
+# Support LiveCD foo
+if sourcex -e "/sbin/livecd-functions.sh"; then
+	livecd_read_commandline
+fi
+
 if [ ! -e ${RC_SVCDIR}/softlevel ]; then
 	eerror "You are attempting to run an openrc service on a"
 	eerror "system which openrc did not boot."
@@ -45,14 +53,6 @@ if [ ! -e ${RC_SVCDIR}/softlevel ]; then
 	exit 1
 fi
 
-sourcex "@SYSCONFDIR@/init.d/functions.sh"
-sourcex "@LIBEXECDIR@/sh/rc-functions.sh"
-
-# Support LiveCD foo
-if sourcex -e "/sbin/livecd-functions.sh"; then
-	livecd_read_commandline
-fi
-
 if [ -z "$1" -o -z "$2" ]; then
 	eerror "$RC_SVCNAME: not enough arguments"
 	exit 1