10_linux: use PARTUUID or path for kernels with no initrd generated

Author: Cyanoxygen

util/grub.d/10_linux.in

@@ -207,7 +207,7 @@ find_rootdev() {
 	local ident_type=uuid
 	if ! [ -e "$GRUB_DEVICE" ] ; then
 		ident_type=error
-	elif bool "$GRUB_DISABLE_LINUX_UUID" ; then
+	elif bool "$GRUB_DISABLE_LINUX_UUID" || [ "$1" = "fallback" ] ; then
 		if bool "$GRUB_DISABLE_LINUX_PARTUUID" ; then
 			ident_type=path
 		else
@@ -317,6 +317,7 @@ process_kernels() {
 	latest_kernels=($(prioritize ${latest_kernels[@]}))
 	unset IFS
 	ROOT_PARAM="root=$(find_rootdev)"
+	ROOT_PARAM_FALLBACK="root=$(find_rootdev fallback)"
 	if [ -z "${ROOT_PARAM##root=}" ] ; then
 		gettext_printf "Internal error - Failed to find the root device\n" >&2
 		exit 1
@@ -328,7 +329,13 @@ process_kernels() {
 		localpart="${uname_r//$latest/}"
 		comments="$(get_comments "$uname_r")"
 		title="${OS}${comments}"
-		linux_entry "$title" "${GRUB_KERNEL_DIR}${kernel}" "$(get_initrd "$uname_r")" "$ARGS" "${OS_ID}-${kernel}"
+		initrd="$(get_initrd "$uname_r")"
+		if [ -z ${initrd/${INITRD_EARLY}/} ] ; then
+			args="${ARGS/$ROOT_PARAM/$ROOT_PARAM_FALLBACK}"
+		else
+			args="$ARGS"
+		fi
+		linux_entry "$title" "${GRUB_KERNEL_DIR}${kernel}" "$initrd" "$args" "${OS_ID}-${kernel}"
 	done
 	# Now we processed the latest versions of the kernel, time to put
 	# other kernel versions into the submenu.
@@ -350,7 +357,13 @@ process_kernels() {
 			comments="$(gettext_printf "With kernel %s" "$uname_r")"
 			comments=" ($(echo "$comments" | grub_quote))"
 			title="${OS}${comments}"
-			linux_entry "$title" "${GRUB_KERNEL_DIR}/${kernel}" "$(get_initrd "$uname_r")" "$ARGS" "${OS_ID}-${kernel}"
+			initrd="$(get_initrd "$uname_r")"
+			if [ -z ${initrd/${INITRD_EARLY}/} ] ; then
+				ARGS="${ARGS/$ROOT_PARAM/$ROOT_PARAM_FALLBACK}"
+			else
+				args="$ARGS"
+			fi
+			linux_entry "$title" "${GRUB_KERNEL_DIR}${kernel}" "$initrd" "$args" "${OS_ID}-${kernel}"
 		done
 	done
 	printf "}\n"