From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id 7CDF5138202 for ; Sun, 11 Nov 2012 17:32:12 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id EC37021C010; Sun, 11 Nov 2012 17:32:04 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 7412821C010 for ; Sun, 11 Nov 2012 17:32:04 +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 8256733D98B for ; Sun, 11 Nov 2012 17:32:03 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by hornbill.gentoo.org (Postfix) with ESMTP id 61C6EE543C for ; Sun, 11 Nov 2012 17:32:01 +0000 (UTC) From: "Richard Yao" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Richard Yao" Message-ID: <1352653288.30c7284c92cacf47250541172dddb10abd70a7a0.ryao@gentoo> Subject: [gentoo-commits] proj/genkernel:ryao commit in: defaults/ X-VCS-Repository: proj/genkernel X-VCS-Files: defaults/initrd.scripts X-VCS-Directories: defaults/ X-VCS-Committer: ryao X-VCS-Committer-Name: Richard Yao X-VCS-Revision: 30c7284c92cacf47250541172dddb10abd70a7a0 X-VCS-Branch: ryao Date: Sun, 11 Nov 2012 17:32:01 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: 32cb445e-0c45-45c5-a0f5-cf6aebefaaf1 X-Archives-Hash: 09feefc02e97d8b94b5dc63c4359f6d5 Message-ID: <20121111173201.JTdIlFGw3OkpxZraQXH55r5ESg_HdWnVpaSlTrd3bIM@z> commit: 30c7284c92cacf47250541172dddb10abd70a7a0 Author: Fabio Erculiani sabayon org> AuthorDate: Sun Nov 11 09:13:03 2012 +0000 Commit: Richard Yao gentoo org> CommitDate: Sun Nov 11 17:01:28 2012 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=proj/genkernel.git;a=commit;h=30c7284c Unquote ${ZPOOL_FORCE} variable usage. The default value of ${ZPOOL_USAGE} is unset, quoting it would result into a "" argument passed to zpool. The workaround to this is to use "dozfs=force" boot argument. Signed-off-by: Richard Yao gentoo.org> --- defaults/initrd.scripts | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/defaults/initrd.scripts b/defaults/initrd.scripts index 7cb41b3..2e8e744 100755 --- a/defaults/initrd.scripts +++ b/defaults/initrd.scripts @@ -707,7 +707,7 @@ startVolumes() { then good_msg "Importing ZFS pools" - /sbin/zpool import -N -a "${ZPOOL_FORCE}" + /sbin/zpool import -N -a ${ZPOOL_FORCE} if [ "$?" = '0' ] then @@ -725,12 +725,12 @@ startVolumes() { then good_msg "LUKS detected. Reimporting ${ZFS_POOL}" /sbin/zpool export -f "${ZFS_POOL}" - /sbin/zpool import -N "${ZPOOL_FORCE}" "${ZFS_POOL}" + /sbin/zpool import -N ${ZPOOL_FORCE} "${ZFS_POOL}" fi else good_msg "Importing ZFS pool ${ZFS_POOL}" - /sbin/zpool import -N "${ZPOOL_FORCE}" "${ZFS_POOL}" + /sbin/zpool import -N ${ZPOOL_FORCE} "${ZFS_POOL}" if [ "$?" = '0' ] then