From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 0575D138330 for ; Wed, 24 Aug 2016 18:12:03 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 17AF6E0B8D; Wed, 24 Aug 2016 18:12:02 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id B9A78E0B8D for ; Wed, 24 Aug 2016 18:12:01 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id B294234097F for ; Wed, 24 Aug 2016 18:12:00 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 0A8DD2457 for ; Wed, 24 Aug 2016 18:11:58 +0000 (UTC) From: "Mike Gilbert" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Mike Gilbert" Message-ID: <1472062315.6b6dc3200101e816b21bed0be6b795421956f9bf.floppym@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: sys-boot/grub/ X-VCS-Repository: repo/gentoo X-VCS-Files: sys-boot/grub/grub-2.02_beta2-r9.ebuild X-VCS-Directories: sys-boot/grub/ X-VCS-Committer: floppym X-VCS-Committer-Name: Mike Gilbert X-VCS-Revision: 6b6dc3200101e816b21bed0be6b795421956f9bf X-VCS-Branch: master Date: Wed, 24 Aug 2016 18:11:58 +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: 75f02050-20e0-4115-8bf9-ab71549f09e2 X-Archives-Hash: c211e356cba152c0a351cdc3ce3486a4 commit: 6b6dc3200101e816b21bed0be6b795421956f9bf Author: Mike Gilbert gentoo org> AuthorDate: Wed Aug 24 18:11:19 2016 +0000 Commit: Mike Gilbert gentoo org> CommitDate: Wed Aug 24 18:11:55 2016 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6b6dc320 sys-boot/grub: update postinst warnings for multislot Package-Manager: portage-2.3.0_p22 sys-boot/grub/grub-2.02_beta2-r9.ebuild | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sys-boot/grub/grub-2.02_beta2-r9.ebuild b/sys-boot/grub/grub-2.02_beta2-r9.ebuild index 75d6dd1..3bc7b41 100644 --- a/sys-boot/grub/grub-2.02_beta2-r9.ebuild +++ b/sys-boot/grub/grub-2.02_beta2-r9.ebuild @@ -287,7 +287,7 @@ pkg_postinst() { if [[ -e "${ROOT%/}/boot/grub2/grub.cfg" ]]; then ewarn "The grub directory has changed from /boot/grub2 to /boot/grub." - ewarn "Please run grub2-install and grub2-mkconfig -o /boot/grub/grub.cfg." + ewarn "Please run $(usex multislot grub2 grub)-install and $(usex multislot grub2 grub)-mkconfig -o /boot/grub/grub.cfg." if [[ ! -e "${ROOT%/}/boot/grub/grub.cfg" ]]; then mkdir -p "${ROOT%/}/boot/grub" @@ -315,7 +315,7 @@ pkg_postinst() { local v for v in ${REPLACING_VERSIONS}; do if ! version_is_at_least 2.02_beta2-r8 ${v}; then - ewarn "Please re-run grub2-install to address a security flaw when using" + ewarn "Please re-run $(usex multislot grub2 grub)-install to address a security flaw when using" ewarn "username/password authentication in grub." ewarn "See bug 568326 for more information." fi