From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from pigeon.gentoo.org ([208.92.234.80] helo=lists.gentoo.org) by finch.gentoo.org with esmtp (Exim 4.60) (envelope-from ) id 1RLb5c-0007uf-H7 for garchives@archives.gentoo.org; Wed, 02 Nov 2011 13:42:48 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 6C22321C020; Wed, 2 Nov 2011 13:42:40 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id 20F7621C020 for ; Wed, 2 Nov 2011 13:42:40 +0000 (UTC) Received: from pelican.gentoo.org (unknown [66.219.59.40]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 7215F1B4021 for ; Wed, 2 Nov 2011 13:42:39 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by pelican.gentoo.org (Postfix) with ESMTP id D9BCE80042 for ; Wed, 2 Nov 2011 13:42:38 +0000 (UTC) From: "William Hubbs" To: gentoo-commits@lists.gentoo.org Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "William Hubbs" Message-ID: <27713e3a41574c20336fcbf4fd3522d126045f16.WilliamH@gentoo> Subject: [gentoo-commits] proj/openrc:master commit in: sh/ X-VCS-Repository: proj/openrc X-VCS-Files: sh/runscript.sh.in X-VCS-Directories: sh/ X-VCS-Committer: WilliamH X-VCS-Committer-Name: William Hubbs X-VCS-Revision: 27713e3a41574c20336fcbf4fd3522d126045f16 Date: Wed, 2 Nov 2011 13:42:38 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: quoted-printable X-Archives-Salt: 534c1033-bfb2-4073-a8c9-9af309db7c10 X-Archives-Hash: e337aa7d5df61387a3d71f1aee3fe4f2 commit: 27713e3a41574c20336fcbf4fd3522d126045f16 Author: William Hubbs gentoo org> AuthorDate: Wed Nov 2 13:16:52 2011 +0000 Commit: William Hubbs gentoo org> CommitDate: Wed Nov 2 13:31:43 2011 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=3Dproj/openrc.git;a=3D= commit;h=3D27713e3a Make sure we load external scripts before using eerror Reported-by: Jochen Schlick gmail.com> X-Gentoo-Bug: 388715 X-Gentoo-Bug-URL: http://bugs.gentoo.org/show_bug.cgi?id=3D388715 --- 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 } =20 +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 =20 -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