Attachment 909733 Details for Bug 1108296 – v1.1: add support specifying linux and initrd in 30_os-prober

[patch] v1.1: add support specifying linux and initrd in 30_os-prober

0001-v1.1-add-support-specifying-linux-and-initrd-in-30_o.patch (text/plain), 2.76 KB, created by Gene Czarcinski on 2014-06-17 19:34:34 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Gene Czarcinski

Created: 2014-06-17 19:34:34 UTC

Size: 2.76 KB

patch

obsolete

>From 1a66be6603ecfa1cef51d04f4dceedbc96659df2 Mon Sep 17 00:00:00 2001
>From: Gene Czarcinski <gczarcinski@gmail.com>
>Date: Tue, 17 Jun 2014 15:25:53 -0400
>Subject: [PATCH] v1.1: add support specifying linux and initrd in 30_os-prober
>Content-Type: text/plain; charset="utf-8"
>Content-Transfer-Encoding: 8bit
>
>With the use of linux16/initrd16 and linuxefi/initefi, assuming that
>linux/initrd are the operations used by 30_os-prober is incorrect.
>
>This patch adds code to support additional information from
>linux-boot-prober which specifies the actual linux/initrd
>values in use.  Note that in the original code there were only
>six parameters returned by linux-boot-prober.  This patch adds
>a seventh and eighth.  Therefore, the sixth parameter must
>be specified as "6" and not "6-".
>
>To operate properly, this requres that os-prober be update
>to provide the additional information returned by linux-boot-prober.
>
>This patch addresses the problems identified in rhbz #1108296 and
>may also fix rhbz #1051632.  Also see rhbz #1108344.
>---
> util/grub.d/30_os-prober.in | 20 +++++++++++++++-----
> 1 file changed, 15 insertions(+), 5 deletions(-)
>
>diff --git a/util/grub.d/30_os-prober.in b/util/grub.d/30_os-prober.in
>index 390bb0e..a297944 100644
>--- a/util/grub.d/30_os-prober.in
>+++ b/util/grub.d/30_os-prober.in
>@@ -201,12 +201,22 @@ EOF
>         LLABEL="`echo ${LINUX} | cut -d ':' -f 3 | tr '^' ' '`"
>         LKERNEL="`echo ${LINUX} | cut -d ':' -f 4`"
>         LINITRD="`echo ${LINUX} | cut -d ':' -f 5`"
>-        LPARAMS="`echo ${LINUX} | cut -d ':' -f 6- | tr '^' ' '`"
>+        LPARAMS="`echo ${LINUX} | cut -d ':' -f 6 | tr '^' ' '`"
>+        LKERNEL_TYPE="`echo ${LINUX} | cut -d ':' -f 7`"
>+        LINITRD_TYPE="`echo ${LINUX} | cut -d ':' -f 8`"
> 
>         if [ -z "${LLABEL}" ] ; then
>           LLABEL="${LONGNAME}"
>         fi
> 
>+	if [ "x$LKERNEL_TYPE" == "x" ] ; then
>+	  LKERNEL_TYPE="linux"
>+	fi
>+
>+	if [ "x$LINITRD_TYPE" == "x" ] ; then
>+	  LINITRD_TYPE="initrd"
>+	fi
>+
> 	if [ "${LROOT}" != "${LBOOT}" ]; then
> 	  LKERNEL="${LKERNEL#/boot}"
> 	  LINITRD="${LINITRD#/boot}"
>@@ -234,11 +244,11 @@ EOF
> 	    save_default_entry | grub_add_tab
> 	    printf '%s\n' "${prepare_boot_cache}"
> 	    cat <<  EOF
>-	linux ${LKERNEL} ${LPARAMS}
>+	$LKERNEL_TYPE ${LKERNEL} ${LPARAMS}
> EOF
>             if [ -n "${LINITRD}" ] ; then
>           cat << EOF
>-	initrd ${LINITRD}
>+	$LINITRD_TYPE ${LINITRD}
> EOF
>             fi
>         cat << EOF
>@@ -254,11 +264,11 @@ EOF
> 	save_default_entry | sed -e "s/^/$grub_tab$grub_tab/"
> 	printf '%s\n' "${prepare_boot_cache}" | grub_add_tab
> 	cat <<  EOF
>-		linux ${LKERNEL} ${LPARAMS}
>+		$LKERNEL_TYPE ${LKERNEL} ${LPARAMS}
> EOF
>         if [ -n "${LINITRD}" ] ; then
>             cat << EOF
>-		initrd ${LINITRD}
>+		$LINITRD_TYPE ${LINITRD}
> EOF
>         fi
>         cat << EOF
>-- 
>1.9.3
>

Actions: View | Diff

Attachments on bug 1108296: 908187 | 909733 | 951005