[gentoo-commits] proj/genkernel:ryao commit in: /

[Richard Yao]

commit:     fa056924d69fceb3afc151e4294b5206d3a26c51
Author:     Richard Yao <ryao <AT> gentoo <DOT> org>
AuthorDate: Mon Jun  3 23:35:48 2013 +0000
Commit:     Richard Yao <ryao <AT> gentoo <DOT> org>
CommitDate: Mon Jun  3 23:48:20 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/genkernel.git;a=commit;h=fa056924

Silence cp error when optional ZFS files are unavailable

Users were seeing the following error message printed:

cp: cannot stat ‘/etc/zfs/zdev.conf’: No such file or directory

Both zdev.conf and zpool.cache are optional files. We print a warning
when they are absent, but cp printed its own error in addition to our
warning. We suppress that.

Signed-off-by: Richard Yao <ryao <AT> gentoo.org>

---
 gen_initramfs.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gen_initramfs.sh b/gen_initramfs.sh
index 427ffad..745e15a 100755
--- a/gen_initramfs.sh
+++ b/gen_initramfs.sh
@@ -429,7 +429,7 @@ append_zfs(){
 	# Copy files to /etc/zfs
 	for i in /etc/zfs/{zdev.conf,zpool.cache}
 	do
-		cp -a "${i}" "${TEMP}/initramfs-zfs-temp/etc/zfs" \
+		cp -a "${i}" "${TEMP}/initramfs-zfs-temp/etc/zfs" 2> /dev/null \
 			|| print_warning 1 "Could not copy file ${i} for ZFS"
 	done