[gentoo-commits] repo/gentoo:master commit in: sys-boot/grub/

[Mike Gilbert]

commit:     6b6dc3200101e816b21bed0be6b795421956f9bf
Author:     Mike Gilbert <floppym <AT> gentoo <DOT> org>
AuthorDate: Wed Aug 24 18:11:19 2016 +0000
Commit:     Mike Gilbert <floppym <AT> gentoo <DOT> 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