Merge lp:~sergiusens/snappy-hub/refinedGrub into lp:~snappy-dev/snappy-hub/snappy-systems

[Sergio Schvezov]

Refine check for snappy-[a|b] kernels

[John Lenton (chipaca)]

review: Approve

=== modified file 'generic-amd64/grub.cfg'
--- generic-amd64/grub.cfg	2015-06-30 11:18:37 +0000
+++ generic-amd64/grub.cfg	2015-07-02 23:06:24 +0000
@@ -42,7 +42,7 @@
 set cmdline="root=LABEL=$label ro init=/lib/systemd/systemd console=tty1 console=ttyS0 panic=-1"
 
 menuentry "$label" {
-    if [ -d "$prefix/$snappy_ab" ]; then
+    if [ -e "$prefix/$snappy_ab/vmlinuz" ]; then
         linux $prefix/$snappy_ab/vmlinuz $cmdline
         initrd $prefix/$snappy_ab/initrd.img
     else
 
=== modified file 'generic-i386/grub.cfg'
--- generic-i386/grub.cfg	2015-06-30 11:18:37 +0000
+++ generic-i386/grub.cfg	2015-07-02 23:06:24 +0000
@@ -42,7 +42,7 @@
 set cmdline="root=LABEL=$label ro init=/lib/systemd/systemd console=tty1 console=ttyS0 panic=-1"
 
 menuentry "$label" {
-    if [ -d "$prefix/$snappy_ab" ]; then
+    if [ -e "$prefix/$snappy_ab/vmlinuz" ]; then
         linux $prefix/$snappy_ab/vmlinuz $cmdline
         initrd $prefix/$snappy_ab/initrd.img
     else