aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRichard Yao <ryao@gentoo.org>2012-11-05 13:32:08 -0500
committerRichard Yao <ryao@gentoo.org>2012-11-05 13:32:08 -0500
commite4af35fdfcd6115741982fe0371d1b6b5f8c6db4 (patch)
treeb8f4d9a07b3ab9037cb66adfbdbf07550c9a6c87
parentRemove redundant default no setting (diff)
downloadgenkernel-e4af35fdfcd6115741982fe0371d1b6b5f8c6db4.tar.gz
genkernel-e4af35fdfcd6115741982fe0371d1b6b5f8c6db4.tar.bz2
genkernel-e4af35fdfcd6115741982fe0371d1b6b5f8c6db4.zip
Make missing ZFS config file failures into warnings, bug #438200v3.4.45
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 <zero_chaos@gentoo.org> Reported-by: Alexander Zubkov <green@msu.ru> Signed-off-by: Richard Yao <ryao@gentoo.org>
-rwxr-xr-xgen_initramfs.sh2
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