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 F3A4D138200 for ; Tue, 6 Nov 2012 06:30:58 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 41C4421C01C; Tue, 6 Nov 2012 06:30:44 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id 95DBF21C01C for ; Tue, 6 Nov 2012 06:30:43 +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 C8B1433D865 for ; Tue, 6 Nov 2012 06:30:42 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by hornbill.gentoo.org (Postfix) with ESMTP id 43CA5E544D for ; Tue, 6 Nov 2012 06:30:41 +0000 (UTC) From: "Robin H. Johnson" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Robin H. Johnson" Message-ID: <1352140328.e4af35fdfcd6115741982fe0371d1b6b5f8c6db4.robbat2@gentoo> Subject: [gentoo-commits] proj/genkernel:master commit in: / X-VCS-Repository: proj/genkernel X-VCS-Files: gen_initramfs.sh X-VCS-Directories: / X-VCS-Committer: robbat2 X-VCS-Committer-Name: Robin H. Johnson X-VCS-Revision: e4af35fdfcd6115741982fe0371d1b6b5f8c6db4 X-VCS-Branch: master Date: Tue, 6 Nov 2012 06:30:41 +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: e9c1f5fc-550a-45f6-b6d4-d4f36bc6aa9e X-Archives-Hash: c212d29d9e5e36396c21bd27327baf3d commit: e4af35fdfcd6115741982fe0371d1b6b5f8c6db4 Author: Richard Yao gentoo org> AuthorDate: Mon Nov 5 18:32:08 2012 +0000 Commit: Robin H. Johnson gentoo org> CommitDate: Mon Nov 5 18:32:08 2012 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=proj/genkernel.git;a=commit;h=e4af35fd Make missing ZFS config file failures into warnings, bug #438200 Whenever /etc/zfs/{zdev.conf,zpool.cache} was missing, we would fail. zpool.cache is not generated during cross compilation, which causes a failure in Catalyst when building LiveCDs. Users that do not follow a strict set of installation instructions can also suffer failures as a consequence of this. zpool.cache includes information about known pools that enables ZFS to detect situations where an entire pool disappears. It is also required to do pool import in corner cases, such as those those involving file-based pools, and has the beneficial effect of reducing pool import times. Unconditional omission of zpool.cache in general is not an option, but for the situations identified, it is okay to convert the failure into a warning, which is what we do. Reported-by: Rick Farina gentoo.org> Reported-by: Alexander Zubkov msu.ru> Signed-off-by: Richard Yao gentoo.org> --- gen_initramfs.sh | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/gen_initramfs.sh b/gen_initramfs.sh index 64e00e8..99bd3f3 100755 --- a/gen_initramfs.sh +++ b/gen_initramfs.sh @@ -410,7 +410,7 @@ append_zfs(){ for i in /etc/zfs/{zdev.conf,zpool.cache} do cp -a "${i}" "${TEMP}/initramfs-zfs-temp/etc/zfs" \ - || gen_die "Could not copy file ${i} for ZFS" + || print_warning 1 "Could not copy file ${i} for ZFS" done # Copy binaries