From 08da506d4cf57b692f33fc04d41010d47c0cd3b0 Mon Sep 17 00:00:00 2001
From: "Rick Farina (Zero_Chaos)" <zerochaos@gentoo.org>
Date: Thu, 27 Aug 2020 14:23:44 -0400
Subject: [PATCH] pentoo-updater: make even more sure that kernel can be
 upgraded

---
 scripts/pentoo-updater.sh | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/scripts/pentoo-updater.sh b/scripts/pentoo-updater.sh
index bfdedac3b..255645408 100755
--- a/scripts/pentoo-updater.sh
+++ b/scripts/pentoo-updater.sh
@@ -135,17 +135,19 @@ check_profile () {
 }
 
 update_kernel() {
+  #bigger updates can fail, so make sure at least all this stuff is up to date
+  emerge --update sys-kernel/pentoo-sources sys-kernel/genkernel sys-kernel/linux-firmware sys-firmware/intel-microcode --oneshot || safe_exit
   bestkern="$(qlist $(portageq best_version / pentoo-sources 2> /dev/null) | grep 'distro/Kconfig' | awk -F'/' '{print $4}' | cut -d'-' -f 2-)"
   bestkern_pv="$(portageq best_version / pentoo-sources | cut -d'-' -f 4-)"
-  if [ -z "${bestkern}" ]; then
-    printf "Failed to find pentoo-sources installed, is this a Pentoo system?\n"
-    bestkern="$(qlist $(portageq best_version / gentoo-sources 2> /dev/null) | grep 'distro/Kconfig' | awk -F'/' '{print $4}' | cut -d'-' -f 2-)"
-    bestkern_pv="$(portageq best_version / gentoo-sources | cut -d'-' -f 4-)"
+  #if [ -z "${bestkern}" ]; then
+  #  printf "Failed to find pentoo-sources installed, is this a Pentoo system?\n"
+  #  bestkern="$(qlist $(portageq best_version / gentoo-sources 2> /dev/null) | grep 'distro/Kconfig' | awk -F'/' '{print $4}' | cut -d'-' -f 2-)"
+  #  bestkern_pv="$(portageq best_version / gentoo-sources | cut -d'-' -f 4-)"
     if [ -z "${bestkern}" ]; then
       printf "Failed to find gentoo-sources as well, giving up.\n"
       return 1
     fi
-  fi
+  #fi
 
   #first we check for a config
   local_config="/usr/share/pentoo-sources/config-${ARCH}-${bestkern_pv}"