95-efistub-kernel-bootcfg.install: sync label with upstream

PRETTY_NAME usually already contains VERSION_ID, so this would be
double. Not that it really effects Gentoo since we are rolling.

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

Author: Nowa-Ammerlaan

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

@@ -36,7 +36,14 @@ if [[ ${KERNEL_INSTALL_LAYOUT} == "uki" ]]; then
 			. /usr/lib/os-release
 		fi
 
-		TITLE="${PRETTY_NAME:+$PRETTY_NAME }${VERSION_ID:+$VERSION_ID }${KERNEL_VERSION} (UKI)"
+		if [[ -n "${PRETTY_NAME}" ]]; then
+            TITLE="${PRETTY_NAME} ${KERNEL_VERSION} (UKI)"
+        elif [[ -n "${NAME}" ]] && [[ -n "${VERSION_ID}" ]]; then
+            TITLE="${NAME} ${VERSION_ID} ${KERNEL_VERSION} (UKI)"
+        else
+            TITLE="${ENTRY_TOKEN} ${KERNEL_VERSION} (UKI)"
+        fi
+
 		PARTLABEL="$(df "${UKI}" --output=source | tail -1 | xargs -r lsblk --output=PARTLABEL --noheadings)"
 		if [[ -n ${PARTLABEL} ]]; then
 			TITLE="${TITLE} on ${PARTLABEL}"
@@ -100,7 +107,14 @@ elif [[ ${KERNEL_INSTALL_LAYOUT} == "efistub"  ]]; then
 			KERNEL_BOOTCFG_ARGS+=( --cmdline "${BOOT_OPTIONS}" )
 		fi
 
-		TITLE="${PRETTY_NAME:+$PRETTY_NAME }${VERSION_ID:+$VERSION_ID }${KERNEL_VERSION} (plain)"
+		if [[ -n "${PRETTY_NAME}" ]]; then
+            TITLE="${PRETTY_NAME} ${KERNEL_VERSION} (plain)"
+        elif [[ -n "${NAME}" ]] && [[ -n "${VERSION_ID}" ]]; then
+            TITLE="${NAME} ${VERSION_ID} ${KERNEL_VERSION} (plain)"
+        else
+            TITLE="${ENTRY_TOKEN} ${KERNEL_VERSION} (plain)"
+        fi
+
 		PARTLABEL="$(df "${KERNEL_IMAGE}" --output=source | tail -1 | xargs -r lsblk --output=PARTLABEL --noheadings)"
 		if [[ -n ${PARTLABEL} ]]; then
 			TITLE="${TITLE} on ${PARTLABEL}"