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 1R5Nef-0004z2-5G for garchives@archives.gentoo.org; Sun, 18 Sep 2011 20:07:57 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 7635021C037; Sun, 18 Sep 2011 20:07:49 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id 499F121C037 for ; Sun, 18 Sep 2011 20:07:49 +0000 (UTC) Received: from pelican.gentoo.org (unknown [66.219.59.40]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id BAED21B4036 for ; Sun, 18 Sep 2011 20:07:48 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by pelican.gentoo.org (Postfix) with ESMTP id CBBC080042 for ; Sun, 18 Sep 2011 20:07:47 +0000 (UTC) From: "Mike Frysinger" To: gentoo-commits@lists.gentoo.org Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Mike Frysinger" Message-ID: <95adeb85bad458d3eb41c6c88289fdb462594641.vapier@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: vapier X-VCS-Committer-Name: Mike Frysinger X-VCS-Revision: 95adeb85bad458d3eb41c6c88289fdb462594641 Date: Sun, 18 Sep 2011 20:07:47 +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: X-Archives-Hash: a2d0a4fef03b10eb4cd7547df1201410 commit: 95adeb85bad458d3eb41c6c88289fdb462594641 Author: Mike Frysinger gentoo org> AuthorDate: Sun Sep 18 03:07:33 2011 +0000 Commit: Mike Frysinger gentoo org> CommitDate: Sun Sep 18 19:25:51 2011 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=3Dproj/openrc.git;a=3D= commit;h=3D95adeb85 runscript: simplify livecd-functions.sh loading Signed-off-by: Mike Frysinger gentoo.org> --- sh/runscript.sh.in | 3 +-- 1 files changed, 1 insertions(+), 2 deletions(-) diff --git a/sh/runscript.sh.in b/sh/runscript.sh.in index fe30a03..5853212 100644 --- a/sh/runscript.sh.in +++ b/sh/runscript.sh.in @@ -49,8 +49,7 @@ sourcex "@SYSCONFDIR@/init.d/functions.sh" sourcex "@LIBEXECDIR@/sh/rc-functions.sh" =20 # Support LiveCD foo -if [ -r /sbin/livecd-functions.sh ]; then - sourcex "/sbin/livecd-functions.sh" +if sourcex -e "/sbin/livecd-functions.sh"; then livecd_read_commandline fi =20