Gentoo Archives: gentoo-commits

From: Mike Gilbert <floppym@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: sys-boot/grub/
Date: Wed, 24 Aug 2016 18:12:03
Message-Id: 1472062315.6b6dc3200101e816b21bed0be6b795421956f9bf.floppym@gentoo
1 commit: 6b6dc3200101e816b21bed0be6b795421956f9bf
2 Author: Mike Gilbert <floppym <AT> gentoo <DOT> org>
3 AuthorDate: Wed Aug 24 18:11:19 2016 +0000
4 Commit: Mike Gilbert <floppym <AT> gentoo <DOT> org>
5 CommitDate: Wed Aug 24 18:11:55 2016 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6b6dc320
7
8 sys-boot/grub: update postinst warnings for multislot
9
10 Package-Manager: portage-2.3.0_p22
11
12 sys-boot/grub/grub-2.02_beta2-r9.ebuild | 4 ++--
13 1 file changed, 2 insertions(+), 2 deletions(-)
14
15 diff --git a/sys-boot/grub/grub-2.02_beta2-r9.ebuild b/sys-boot/grub/grub-2.02_beta2-r9.ebuild
16 index 75d6dd1..3bc7b41 100644
17 --- a/sys-boot/grub/grub-2.02_beta2-r9.ebuild
18 +++ b/sys-boot/grub/grub-2.02_beta2-r9.ebuild
19 @@ -287,7 +287,7 @@ pkg_postinst() {
20
21 if [[ -e "${ROOT%/}/boot/grub2/grub.cfg" ]]; then
22 ewarn "The grub directory has changed from /boot/grub2 to /boot/grub."
23 - ewarn "Please run grub2-install and grub2-mkconfig -o /boot/grub/grub.cfg."
24 + ewarn "Please run $(usex multislot grub2 grub)-install and $(usex multislot grub2 grub)-mkconfig -o /boot/grub/grub.cfg."
25
26 if [[ ! -e "${ROOT%/}/boot/grub/grub.cfg" ]]; then
27 mkdir -p "${ROOT%/}/boot/grub"
28 @@ -315,7 +315,7 @@ pkg_postinst() {
29 local v
30 for v in ${REPLACING_VERSIONS}; do
31 if ! version_is_at_least 2.02_beta2-r8 ${v}; then
32 - ewarn "Please re-run grub2-install to address a security flaw when using"
33 + ewarn "Please re-run $(usex multislot grub2 grub)-install to address a security flaw when using"
34 ewarn "username/password authentication in grub."
35 ewarn "See bug 568326 for more information."
36 fi