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 0E22E138200 for ; Mon, 3 Jun 2013 23:49:53 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 73428E0830; Mon, 3 Jun 2013 23:49:52 +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 E22C4E0830 for ; Mon, 3 Jun 2013 23:49:51 +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 0CDA333DF5F for ; Mon, 3 Jun 2013 23:49:51 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by hornbill.gentoo.org (Postfix) with ESMTP id B3CD7E545D for ; Mon, 3 Jun 2013 23:49:49 +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: <1370303345.9e0f58b9b922f80f4dff6ca5dce7fb50e8bfd3ce.ryao@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: ryao X-VCS-Committer-Name: Richard Yao X-VCS-Revision: 9e0f58b9b922f80f4dff6ca5dce7fb50e8bfd3ce X-VCS-Branch: master Date: Mon, 3 Jun 2013 23:49:49 +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: a548b35b-926c-48f8-bdeb-723147f769de X-Archives-Hash: e4d1cb4db7750ebfaa2e38fbfa3f6d8e commit: 9e0f58b9b922f80f4dff6ca5dce7fb50e8bfd3ce Author: Richard Yao gentoo org> AuthorDate: Mon Jun 3 23:35:48 2013 +0000 Commit: Richard Yao gentoo org> CommitDate: Mon Jun 3 23:49:05 2013 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=proj/genkernel.git;a=commit;h=9e0f58b9 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 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 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 A4BC9138200 for ; Thu, 6 Jun 2013 03:36:28 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 48D42E096B; Thu, 6 Jun 2013 03:36:27 +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 93073E0952 for ; Thu, 6 Jun 2013 03:36:26 +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 A40A933E2E2 for ; Thu, 6 Jun 2013 03:36:25 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by hornbill.gentoo.org (Postfix) with ESMTP id 51C6DE545D for ; Thu, 6 Jun 2013 03:36:24 +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: <1370303345.9e0f58b9b922f80f4dff6ca5dce7fb50e8bfd3ce.ryao@gentoo> Subject: [gentoo-commits] proj/genkernel:ryao commit in: / X-VCS-Repository: proj/genkernel X-VCS-Files: gen_initramfs.sh X-VCS-Directories: / X-VCS-Committer: ryao X-VCS-Committer-Name: Richard Yao X-VCS-Revision: 9e0f58b9b922f80f4dff6ca5dce7fb50e8bfd3ce X-VCS-Branch: ryao Date: Thu, 6 Jun 2013 03:36:24 +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: 91b34831-33b6-41b8-b871-47786495b658 X-Archives-Hash: 5d841c31d8709dad67232c1255c84b57 Message-ID: <20130606033624.0F2vu0Zrn79nyqgiErtynnzYuT2Fzp0cV6JbauatU88@z> commit: 9e0f58b9b922f80f4dff6ca5dce7fb50e8bfd3ce Author: Richard Yao gentoo org> AuthorDate: Mon Jun 3 23:35:48 2013 +0000 Commit: Richard Yao gentoo org> CommitDate: Mon Jun 3 23:49:05 2013 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=proj/genkernel.git;a=commit;h=9e0f58b9 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 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