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 1SIBXZ-0007ef-8p for garchives@archives.gentoo.org; Thu, 12 Apr 2012 04:21:49 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id F2CDBE09AB; Thu, 12 Apr 2012 04:21:31 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id BE55EE09AB for ; Thu, 12 Apr 2012 04:21:31 +0000 (UTC) Received: from hornbill.gentoo.org (hornbill.gentoo.org [94.100.119.163]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 2B3E71B4024 for ; Thu, 12 Apr 2012 04:21:31 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by hornbill.gentoo.org (Postfix) with ESMTP id B49D0E5402 for ; Thu, 12 Apr 2012 04:21:29 +0000 (UTC) From: "Sebastian Pipping" To: gentoo-commits@lists.gentoo.org Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Sebastian Pipping" Message-ID: <1334203724.391a9b996934f1590fb663674ddbb1bff1cb60aa.sping@gentoo> Subject: [gentoo-commits] proj/genkernel:master commit in: defaults/ X-VCS-Repository: proj/genkernel X-VCS-Files: defaults/linuxrc X-VCS-Directories: defaults/ X-VCS-Committer: sping X-VCS-Committer-Name: Sebastian Pipping X-VCS-Revision: 391a9b996934f1590fb663674ddbb1bff1cb60aa X-VCS-Branch: master Date: Thu, 12 Apr 2012 04:21:29 +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: bceeec5e-03a9-4e2d-b80a-db85fe562877 X-Archives-Hash: 6846deceea29cc94c9723b9761265c45 commit: 391a9b996934f1590fb663674ddbb1bff1cb60aa Author: Richard Yao cs stonybrook edu> AuthorDate: Sat Apr 7 21:17:50 2012 +0000 Commit: Sebastian Pipping gentoo org> CommitDate: Thu Apr 12 04:08:44 2012 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=3Dproj/genkernel.git= ;a=3Dcommit;h=3D391a9b99 Move ZFS binary check outside of commandline loop --- defaults/linuxrc | 23 +++++++++++++---------- 1 files changed, 13 insertions(+), 10 deletions(-) diff --git a/defaults/linuxrc b/defaults/linuxrc index 9ac2c7c..4a16462 100755 --- a/defaults/linuxrc +++ b/defaults/linuxrc @@ -97,16 +97,11 @@ do USE_DMRAID_NORMAL=3D1 ;; dozfs*) - if [ ! -x /sbin/zfs ]; then - USE_ZFS=3D0 - bad_msg 'zfs binary not found: aborting use of zfs!' - else - USE_ZFS=3D1 - MY_HWOPTS=3D"${MY_HWOPTS} zfs" - if [ "${x#*=3D}" =3D 'force' ] - then - ZPOOL_FORCE=3D-f - fi + USE_ZFS=3D1 + MY_HWOPTS=3D"${MY_HWOPTS} zfs" + if [ "${x#*=3D}" =3D 'force' ] + then + ZPOOL_FORCE=3D-f fi ;; # Debug Options @@ -253,6 +248,14 @@ then REAL_ROOT=3D"${FAKE_ROOT}" fi =20 +# Disable ZFS when support is missing +if [ "USE_ZFS" =3D "1" -a ! -x /sbin/zfs ] +then + USE_ZFS=3D0 + MY_HWOPTS=3D$(echo ${MY_HWOPTS} | sed -e 's/ zfs//g') + bad_msg 'zfs binary not found: aborting use of zfs!' +fi + splash 'init' =20 cmdline_hwopts