[gentoo-commits] repo/gentoo:master commit in: sys-kernel/genkernel/

[Ulrich Müller]

commit:     3cb0abaeb8e6959880ea6162e7777db8c9ceb816
Author:     Ulrich Müller <ulm <AT> gentoo <DOT> org>
AuthorDate: Fri Dec 13 22:31:13 2019 +0000
Commit:     Ulrich Müller <ulm <AT> gentoo <DOT> org>
CommitDate: Fri Dec 13 22:33:45 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3cb0abae

sys-kernel/genkernel: Fix breakage triggered by mount-boot update.

mount-boot_mount_boot_partition() was an internal and undocumented
function which shouldn't have been called, in the first place.

Delete it from pkg_postinst without replacement, because the relevant
checks in mount-boot_check_status will have been called already in
mount-boot_pkg_preinst.

Drop the call to mount-boot_pkg_postinst as well, because that
function is a no-op now.

Package-Manager: Portage-2.3.81, Repoman-2.3.20
Signed-off-by: Ulrich Müller <ulm <AT> gentoo.org>

 sys-kernel/genkernel/genkernel-4.0.0-r1.ebuild | 2 --
 sys-kernel/genkernel/genkernel-9999.ebuild     | 2 --
 2 files changed, 4 deletions(-)

diff --git a/sys-kernel/genkernel/genkernel-4.0.0-r1.ebuild 
b/sys-kernel/genkernel/genkernel-4.0.0-r1.ebuild
index c84640e954f..9a9acff5358 100644
--- a/sys-kernel/genkernel/genkernel-4.0.0-r1.ebuild
+++ b/sys-kernel/genkernel/genkernel-4.0.0-r1.ebuild
@@ -234,7 +234,6 @@ pkg_postinst() {
                fi
        done
 
-       mount-boot_mount_boot_partition
        if [[ $(find /boot -name 'kernel-genkernel-*' 2>/dev/null | wc -l) -gt 
0 ]] ; then
                ewarn ''
                ewarn 'Default kernel filename was changed from 
"kernel-genkernel-<ARCH>-<KV>"'
@@ -243,7 +242,6 @@ pkg_postinst() {
                ewarn 'built with genkernel before that name change, resulting 
in booting old'
                ewarn 'kernel when not paying attention on boot.'
        fi
-       mount-boot_pkg_postinst
 
        # Show special warning for users depending on remote unlock capabilities
        local gk_config="${EROOT}/etc/genkernel.conf"

diff --git a/sys-kernel/genkernel/genkernel-9999.ebuild 
b/sys-kernel/genkernel/genkernel-9999.ebuild
index 6f69a282d07..051e149a13d 100644
--- a/sys-kernel/genkernel/genkernel-9999.ebuild
+++ b/sys-kernel/genkernel/genkernel-9999.ebuild
@@ -232,7 +232,6 @@ pkg_postinst() {
                fi
        done
 
-       mount-boot_mount_boot_partition
        if [[ $(find /boot -name 'kernel-genkernel-*' 2>/dev/null | wc -l) -gt 
0 ]] ; then
                ewarn ''
                ewarn 'Default kernel filename was changed from 
"kernel-genkernel-<ARCH>-<KV>"'
@@ -241,7 +240,6 @@ pkg_postinst() {
                ewarn 'built with genkernel before that name change, resulting 
in booting old'
                ewarn 'kernel when not paying attention on boot.'
        fi
-       mount-boot_pkg_postinst
 
        # Show special warning for users depending on remote unlock capabilities
        local gk_config="${EROOT}/etc/genkernel.conf"