Merge ~ubuntu-core-dev/grub/+git/ubuntu:feature/initrd-less-boot-with-fallback-cleanup into ~ubuntu-core-dev/grub/+git/ubuntu:feature/initrd-less-boot-with-fallback

[Steve Langasek]

Two cleanups to the implementation vs. previous branch:
  - Clean up the indent handling to match existing practice.
  - Eliminate string duplication.
Perhaps not directly mergeable in present form due to git-dpm and rebasing, but looking for review before landing this.

diff --git a/debian/.git-dpm b/debian/.git-dpm
index 7d8b55f..4da947c 100644
--- a/debian/.git-dpm
+++ b/debian/.git-dpm
@@ -1,6 +1,6 @@
 # see git-dpm(1) from git-dpm package
-864dd07df01d460b04492080cb8c33590d175e94
-864dd07df01d460b04492080cb8c33590d175e94
+8ab8c3dcd38ba9b32006d02e06c78b04e7559c27
+8ab8c3dcd38ba9b32006d02e06c78b04e7559c27
 0992ffbac6a1b4c97c350d12e5301e0067daa0d6
 0992ffbac6a1b4c97c350d12e5301e0067daa0d6
 grub2_2.02.orig.tar.xz
diff --git a/debian/patches/add-initrd-less-boot-fallback.patch b/debian/patches/add-initrd-less-boot-fallback.patch
index ef9e00d..b397d47 100644
--- a/debian/patches/add-initrd-less-boot-fallback.patch
+++ b/debian/patches/add-initrd-less-boot-fallback.patch
@@ -1,4 +1,4 @@
-From 864dd07df01d460b04492080cb8c33590d175e94 Mon Sep 17 00:00:00 2001
+From 8ab8c3dcd38ba9b32006d02e06c78b04e7559c27 Mon Sep 17 00:00:00 2001
 From: Chris Glass <[e-mail]>
 Date: Thu, 8 Mar 2018 16:16:55 +0100
 Subject: Added initrd-less boot capabilities.
@@ -6,14 +6,19 @@ Subject: Added initrd-less boot capabilities.
 In case the kernel fails to boot without an initrd, grub will fallback
 to trying to boot the kernel with an initrd.
 
+- Clean up the indent handling to match existing practice.
+- Eliminate string duplication.
+
 Patch-Name: add-initrd-less-boot-fallback.patch
+
+Signed-off-by: Steve Langasek <[e-mail]>
 ---
  Makefile.am                  |  3 +++
  configure.ac                 | 10 +++++++++
- grub-initrd-fallback.service | 13 +++++++++++
- util/grub.d/00_header.in     | 27 ++++++++++++++++++++++
- util/grub.d/10_linux.in      | 53 ++++++++++++++++++++++++++++++++------------
- 5 files changed, 92 insertions(+), 14 deletions(-)
+ grub-initrd-fallback.service | 13 ++++++++++++
+ util/grub.d/00_header.in     | 27 ++++++++++++++++++++++++
+ util/grub.d/10_linux.in      | 50 +++++++++++++++++++++++++++++++++-----------
+ 5 files changed, 91 insertions(+), 12 deletions(-)
  create mode 100644 grub-initrd-fallback.service
 
 diff --git a/Makefile.am b/Makefile.am
@@ -114,7 +119,7 @@ index 674a76140..23322458a 100644
      cat <<EOF
  function recordfail {
 diff --git a/util/grub.d/10_linux.in b/util/grub.d/10_linux.in
-index 76d4f31bf..8590704a3 100644
+index 76d4f31bf..fa615c3e0 100644
 --- a/util/grub.d/10_linux.in
 +++ b/util/grub.d/10_linux.in
 @@ -104,6 +104,10 @@ if [ "$vt_handoff" = 1 ]; then
@@ -128,7 +133,7 @@ index 76d4f31bf..8590704a3 100644
  linux_entry ()
  {
    os="$1"
-@@ -179,27 +183,48 @@ EOF
+@@ -179,27 +183,49 @@ EOF
  	linux	${rel_dirname}/${basename}.efi.signed root=${linux_root_device_thisversion} ro ${args}
  EOF
    else
@@ -139,29 +144,31 @@ index 76d4f31bf..8590704a3 100644
 +    if [ x"$GRUB_FORCE_PARTUUID" != x ]; then
 +        linux_root_device_thisversion="PARTUUID=${GRUB_FORCE_PARTUUID}"
 +    fi
++    message="$(gettext_printf "Loading initial ramdisk ...")"
 +    if test -n "${initrd}" && [ x"$GRUB_FORCE_PARTUUID" != x ]; then
-         sed "s/^/$submenu_indentation/" << EOF
--        linux	${rel_dirname}/${basename} root=${linux_root_device_thisversion} ro ${args}
-+    if [ "\${initrdfail}" = 1 ]; then
-+          linux	  ${rel_dirname}/${basename} root=${linux_root_device_thisversion} ro ${args}
++        sed "s/^/$submenu_indentation/" << EOF
++	if [ "\${initrdfail}" = 1 ]; then
++	  linux	${rel_dirname}/${basename} root=${linux_root_device_thisversion} ro ${args}
 +EOF
 +        if [ x"$quiet_boot" = x0 ] || [ x"$type" != xsimple ]; then
-+          message="$(gettext_printf "Loading initial ramdisk ...")"
-+          echo "	      ${message}"
++          sed "s/^/$submenu_indentation/" << EOF
++	  echo	'$(echo "$message" | grub_quote)'
++EOF
 +        fi
 +
-+        sed "s/^/$submenu_indentation/" << EOF
-+	      initrd	${rel_dirname}/${initrd}
-+    else
-+          linux	  ${rel_dirname}/${basename} root=${linux_root_device_thisversion} ro ${args} panic=-1
-+    fi
-+    initrdfail
+         sed "s/^/$submenu_indentation/" << EOF
+-        linux	${rel_dirname}/${basename} root=${linux_root_device_thisversion} ro ${args}
++	  initrd	${rel_dirname}/${initrd}
++	else
++	  linux	${rel_dirname}/${basename} root=${linux_root_device_thisversion} ro ${args} panic=-1
++	fi
++	initrdfail
  EOF
      else
 +    # We don't have initrd or we don't want to set PARTUUID. Don't try initrd-less boot with fallback.
          sed "s/^/$submenu_indentation/" << EOF
 -        linux	${rel_dirname}/${basename} root=PARTUUID=${GRUB_FORCE_PARTUUID} ro ${args}
-+        linux	${rel_dirname}/${basename} root=${linux_root_device_thisversion} ro ${args}
++	linux	${rel_dirname}/${basename} root=${linux_root_device_thisversion} ro ${args}
  EOF
 -    fi
 -  fi
@@ -170,21 +177,18 @@ index 76d4f31bf..8590704a3 100644
 -    if [ x"$quiet_boot" = x0 ] || [ x"$type" != xsimple ]; then
 -      message="$(gettext_printf "Loading initial ramdisk ...")"
 -      sed "s/^/$submenu_indentation/" << EOF
--	echo	'$(echo "$message" | grub_quote)'
 +	  if test -n "${initrd}"; then
 +	    # We do have initrd - let's use it at boot.
 +	    # TRANSLATORS: ramdisk isn't identifier. Should be translated.
 +	    if [ x"$quiet_boot" = x0 ] || [ x"$type" != xsimple ]; then
-+	      message="$(gettext_printf "Loading initial ramdisk ...")"
 +	      sed "s/^/$submenu_indentation/" << EOF
-+		echo	'$(echo "$message" | grub_quote)'
+ 	echo	'$(echo "$message" | grub_quote)'
  EOF
 -    fi
 -    sed "s/^/$submenu_indentation/" << EOF
--	initrd	${rel_dirname}/${initrd}
 +	    fi
 +	    sed "s/^/$submenu_indentation/" << EOF
-+		initrd	${rel_dirname}/${initrd}
+ 	initrd	${rel_dirname}/${initrd}
  EOF
 +    	  fi
 +    fi
diff --git a/util/grub.d/10_linux.in b/util/grub.d/10_linux.in
index 8590704..fa615c3 100644
--- a/util/grub.d/10_linux.in
+++ b/util/grub.d/10_linux.in
@@ -189,39 +189,40 @@ EOF
     if [ x"$GRUB_FORCE_PARTUUID" != x ]; then
         linux_root_device_thisversion="PARTUUID=${GRUB_FORCE_PARTUUID}"
     fi
+    message="$(gettext_printf "Loading initial ramdisk ...")"
     if test -n "${initrd}" && [ x"$GRUB_FORCE_PARTUUID" != x ]; then
         sed "s/^/$submenu_indentation/" << EOF
-    if [ "\${initrdfail}" = 1 ]; then
-          linux	  ${rel_dirname}/${basename} root=${linux_root_device_thisversion} ro ${args}
+	if [ "\${initrdfail}" = 1 ]; then
+	  linux	${rel_dirname}/${basename} root=${linux_root_device_thisversion} ro ${args}
 EOF
         if [ x"$quiet_boot" = x0 ] || [ x"$type" != xsimple ]; then
-          message="$(gettext_printf "Loading initial ramdisk ...")"
-          echo "	      ${message}"
+          sed "s/^/$submenu_indentation/" << EOF
+	  echo	'$(echo "$message" | grub_quote)'
+EOF
         fi
 
         sed "s/^/$submenu_indentation/" << EOF
-	      initrd	${rel_dirname}/${initrd}
-    else
-          linux	  ${rel_dirname}/${basename} root=${linux_root_device_thisversion} ro ${args} panic=-1
-    fi
-    initrdfail
+	  initrd	${rel_dirname}/${initrd}
+	else
+	  linux	${rel_dirname}/${basename} root=${linux_root_device_thisversion} ro ${args} panic=-1
+	fi
+	initrdfail
 EOF
     else
     # We don't have initrd or we don't want to set PARTUUID. Don't try initrd-less boot with fallback.
         sed "s/^/$submenu_indentation/" << EOF
-        linux	${rel_dirname}/${basename} root=${linux_root_device_thisversion} ro ${args}
+	linux	${rel_dirname}/${basename} root=${linux_root_device_thisversion} ro ${args}
 EOF
 	  if test -n "${initrd}"; then
 	    # We do have initrd - let's use it at boot.
 	    # TRANSLATORS: ramdisk isn't identifier. Should be translated.
 	    if [ x"$quiet_boot" = x0 ] || [ x"$type" != xsimple ]; then
-	      message="$(gettext_printf "Loading initial ramdisk ...")"
 	      sed "s/^/$submenu_indentation/" << EOF
-		echo	'$(echo "$message" | grub_quote)'
+	echo	'$(echo "$message" | grub_quote)'
 EOF
 	    fi
 	    sed "s/^/$submenu_indentation/" << EOF
-		initrd	${rel_dirname}/${initrd}
+	initrd	${rel_dirname}/${initrd}
 EOF
     	  fi
     fi