*: avoid hardcoding "gentoo", use os-release

useful for downstream distro's or folks who simply like to customize

Signed-off-by: Andrew Ammerlaan <[email protected]>

Author: Nowa-Ammerlaan

hooks/95-refind-copy-icon.install

@@ -10,7 +10,7 @@
 ver=${1}
 img=${2}
 
-: "${REFIND_ICON:=/usr/lib64/refind/refind/icons/os_gentoo.png}"
+: "${REFIND_ICON:=/usr/lib64/refind/refind/icons/os_${ID}.png}"
 
 # familiar helpers, we intentionally don't use Gentoo functions.sh
 die() {
@@ -24,6 +24,10 @@ main() {
 
 	[[ ${EUID} -eq 0 ]] || die "Please run this script as root"
 
+	if [[ ! -f ${REFIND_ICON} ]]; then
+		die "REFIND_ICON=${REFIND_ICON} not found"
+	fi
+
 	cp "${REFIND_ICON}" "${img%.efi}.png" || die "Failed to copy icon file"
 }
 

hooks/systemd/90-compat.install

@@ -25,8 +25,19 @@ if [[ ${KERNEL_INSTALL_LAYOUT} == "grub" || ${KERNEL_INSTALL_LAYOUT} == "compat"
 	KERNEL_INSTALL_ROOT="/boot"
 	SUFFIX=
 elif [[ ${KERNEL_INSTALL_LAYOUT} == "efistub"  ]]; then
+	if [[ -f /etc/os-release ]]; then
+		# shellcheck source=/dev/null
+		. /etc/os-release
+	elif [[ -f /usr/lib/os-release ]]; then
+		# shellcheck source=/dev/null
+		. /usr/lib/os-release
+	fi
+
+	# Set sane default if no or broken os-release
+	: "${NAME:=Linux}"
+
 	# For efistub layout, we relocate /boot to the ESP
-	KERNEL_INSTALL_ROOT="${KERNEL_INSTALL_BOOT_ROOT}/EFI/Gentoo"
+	KERNEL_INSTALL_ROOT="${KERNEL_INSTALL_BOOT_ROOT}/EFI/${NAME}"
 	# Some vendors enforce that booted EFI executables have the .efi suffix.
 	# We also want to be able to distinguish between an UKI and a regular
 	# kernel image with an .efi suffix.

hooks/systemd/95-efistub-kernel-bootcfg.install

@@ -41,8 +41,20 @@ if [[ ${KERNEL_INSTALL_LAYOUT} == "uki" ]]; then
 		kernel-bootcfg "${LOGLEVEL}" --remove-uki "${UKI}" || exit 1
 	fi
 elif [[ ${KERNEL_INSTALL_LAYOUT} == "efistub"  ]]; then
-	KERNEL_IMAGE="${KERNEL_INSTALL_BOOT_ROOT}/EFI/Gentoo/kernel-${KERNEL_VERSION}.efi"
-	INITRD="${KERNEL_INSTALL_BOOT_ROOT}/EFI/Gentoo/initramfs-${KERNEL_VERSION}.img"
+
+	if [[ -f /etc/os-release ]]; then
+		# shellcheck source=/dev/null
+		. /etc/os-release
+	elif [[ -f /usr/lib/os-release ]]; then
+		# shellcheck source=/dev/null
+		. /usr/lib/os-release
+	fi
+
+	# Set sane default if no or broken os-release
+	: "${NAME:=Linux}"
+
+	KERNEL_IMAGE="${KERNEL_INSTALL_BOOT_ROOT}/EFI/${NAME}/kernel-${KERNEL_VERSION}.efi"
+	INITRD="${KERNEL_INSTALL_BOOT_ROOT}/EFI/${NAME}/initramfs-${KERNEL_VERSION}.img"
 
 	if [[ ${COMMAND} == add ]]; then
 		if [[ ! -f ${KERNEL_IMAGE} ]]; then

hooks/systemd/95-refind-copy-icon.install

@@ -12,7 +12,24 @@ KERNEL_VERSION="${2}"
 BOOT_DIR_ABS="${3}"
 KERNEL_IMAGE="${4}"
 
-: "${REFIND_ICON:=/usr/lib64/refind/refind/icons/os_gentoo.png}"
+if [[ -f /etc/os-release ]]; then
+	# shellcheck source=/dev/null
+	. /etc/os-release
+elif [[ -f /usr/lib/os-release ]]; then
+	# shellcheck source=/dev/null
+	. /usr/lib/os-release
+fi
+
+# Set sane default if no or broken os-release
+: "${NAME:=Linux}"
+: "${ID:=linux}"
+
+: "${REFIND_ICON:=/usr/lib64/refind/refind/icons/os_${ID}.png}"
+
+if [[ ! -f ${REFIND_ICON} ]]; then
+	echo "REFIND_ICON=${REFIND_ICON} not found"
+	exit 1
+fi
 
 # Refind does not discover kernels in the bls layout
 if [[ ${KERNEL_INSTALL_LAYOUT} == "compat" ]]; then
@@ -30,7 +47,7 @@ elif [[ ${KERNEL_INSTALL_LAYOUT} == "uki" ]]; then
 		rm -f "${UKI_DIR}/${KERNEL_INSTALL_ENTRY_TOKEN}-${KERNEL_VERSION}.png" || exit 1
 	fi
 elif [[ ${KERNEL_INSTALL_LAYOUT} == "efistub" ]]; then
-	EFISTUB_DIR="${KERNEL_INSTALL_BOOT_ROOT}/EFI/Gentoo"
+	EFISTUB_DIR="${KERNEL_INSTALL_BOOT_ROOT}/EFI/${NAME}"
 	if [[ ${COMMAND} == add ]]; then
 		cp "${REFIND_ICON}" "${EFISTUB_DIR}/kernel-${KERNEL_VERSION}.png" || exit 1
 	elif [[ ${COMMAND} == remove ]]; then

installkernel

@@ -7,7 +7,7 @@
 # Copyright (C) 2009  Manoj Srivasta
 # Copyright 2020-2024 Gentoo Authors
 #
-# Install the kernel on a Gentoo Linux system.
+# Install the kernel on a Linux system.
 #
 # This script is called by the kernel's "make install" if it is installed as
 # /sbin/installkernel. It is also called by kernel-install.eclass.
@@ -138,13 +138,26 @@ export INSTALLKERNEL_LAYOUT
 export INSTALLKERNEL_INITRD_GENERATOR
 export INSTALLKERNEL_UKI_GENERATOR
 
+if [ -f /etc/os-release ]; then
+	# shellcheck source=/dev/null
+	. /etc/os-release
+elif [ -f /usr/lib/os-release ]; then
+	# shellcheck source=/dev/null
+	. /usr/lib/os-release
+fi
+
+# Set sane default if no or broken os-release
+export NAME="${NAME:=Linux}"
+export ID="${ID:=linux}"
+export PRETTY_NAME="${PRETTY_NAME:=Linux}"
+
 suffix=
 if [ "${INSTALLKERNEL_LAYOUT}" = efistub ]; then
 	if [ ${#} -le 3 ] || [ "${4}" = "/boot" ]; then
 		# Relocate to ESP
 		for candidate in /boot/EFI /boot/efi /boot /efi; do
-			if [ -d ${candidate}/EFI/Gentoo ]; then
-				dir=${candidate}/EFI/Gentoo
+			if [ -d ${candidate}/EFI/${NAME} ]; then
+				dir=${candidate}/EFI/${NAME}
 				suffix=.efi
 			else
 				continue
@@ -198,7 +211,7 @@ if [ -f "${uki}" ] && [ "${INSTALLKERNEL_LAYOUT}" = uki ]; then
 		for candidate in /boot/EFI /boot/efi /boot /efi; do
 			if [ -d ${candidate}/EFI/Linux ]; then
 				dir=${candidate}/EFI/Linux
-				img_dest=gentoo
+				img_dest=${ID}
 			else
 				continue
 			fi