New upstream version 2019.1

tests/ostree-grub-generator

@@ -1,11 +1,12 @@
 #!/bin/sh
 
-# The builtin grub.cfg generator.
+# The builtin grub.cfg generator. This script is called by
+# ostree/src/libostree/ostree-bootloader-grub2.c whenever boot loader
+# configuration file needs to be updated on systems which do not use
+# grub2-mkconfig (and thus, the `ostree admin instutil grub2-generate` path).
 #
-# This script is called by ostree/src/libostree/ostree-bootloader-grub2.c whenever
-# boot loader configuration file needs to be updated. It can be used as a template
-# for a custom grub.cfg generator. What to consider when writing a custom grub.cfg
-# generator:
+# It can be used as a template for a custom grub.cfg generator. What to consider
+# when writing a custom grub.cfg generator:
 #
 #   - The populate_menu() function converts boot loader entries as defined by
 #   https://www.freedesktop.org/wiki/Specifications/BootLoaderSpec/ into GRUB2
@@ -32,6 +33,7 @@ read_config()
     initrd=""
     options=""
     linux=""
+    devicetree=""
 
     while read -r line
     do
@@ -47,6 +49,9 @@ read_config()
             "linux")
                 linux=${value}
                 ;;
+            "devicetree")
+                devicetree=${value}
+                ;;
             "options")
                 options=${value}
                 ;;
@@ -73,6 +78,9 @@ populate_menu()
         if [ -n "${initrd}" ] ; then
             menu="${menu}\t initrd ${boot_prefix}${initrd}\n"
         fi
+        if [ -n "${devicetree}" ] ; then
+            menu="${menu}\t devicetree ${boot_prefix}${devicetree}\n"
+        fi
         menu="${menu}}\n\n"
     done
     # The printf command seems to be more reliable across shells for special character (\n, \t) evaluation