Merge lp:~sergiusens/snappy/backportAz into lp:~snappy-dev/snappy/15.04-deprecated

[Sergio Schvezov]

Backport 09_snappy to support azure kernel cmdline requirements

[John Lenton (chipaca)]

review: Approve

=== modified file 'etc/grub.d/09_snappy'
--- etc/grub.d/09_snappy	2015-04-14 20:37:54 +0000
+++ etc/grub.d/09_snappy	2015-06-08 20:08:41 +0000
@@ -23,7 +23,6 @@
 
 SNAPPY_OS="Ubuntu Core Snappy"
 SNAPPY_TYPE=simple
-SNAPPY_ARGS="${GRUB_CMDLINE_LINUX} ${GRUB_CMDLINE_LINUX_DEFAULT}"
 
 #---------------------------------------------------------------------
 
@@ -156,6 +155,14 @@
     echo "$list"
 }
 
+# Composes and returns a kernel cmd line
+get_cmdline() {
+    channel_ini="/etc/system-image/channel.ini"
+    grep -q 'device: azure_amd64' "$channel_ini" && azure_cmdline="rootdelay=300"
+
+    echo "${GRUB_CMDLINE_LINUX} ${GRUB_CMDLINE_LINUX_DEFAULT} $azure_cmdline"
+}
+
 # Returns the path to the initrd for the kernel specified by $1.
 # $1: kernel version.
 # $2: directory to look in.
@@ -290,6 +297,7 @@
     local rel_dirname=
     local version=
     local initrd=
+    local cmdline=
 
     # boot by label
     device="LABEL=$label"
@@ -313,6 +321,8 @@
 
     initrd=$(get_initrd "$version" "$dirname")
 
+    cmdline=$(get_cmdline)
+
     # convert the path to the mounted "other" rootfs back to a
     # a standard one by removing the mountpoint prefix.
     if [ "$mountpoint" != "/" ]; then
@@ -322,7 +332,7 @@
 
     # Create menu entries for the 2 snappy rootfs's.
     linux_entry_ext "$name" "$SNAPPY_OS" "$version" \
-        "$SNAPPY_TYPE" "$SNAPPY_ARGS" "$device" \
+        "$SNAPPY_TYPE" "$cmdline" "$device" \
         "$linux" "$initrd"
 }