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

[Sergio Schvezov]

grub.cfg for generic-amd64

[lp:~sergiusens/snappy-hub/grubcfg]

4. By Sergio Schvezov on 2015-06-30

updating grub.cfg, using the same file for i386

[Sergio Schvezov (sergiusens)]

review: Approve

[John Lenton (chipaca)]

review: Approve

=== added file 'generic-amd64/grub.cfg'
--- generic-amd64/grub.cfg	1970-01-01 00:00:00 +0000
+++ generic-amd64/grub.cfg	2015-06-30 11:19:14 +0000
@@ -0,0 +1,54 @@
+set default=0
+set timeout=3
+
+insmod part_gpt
+insmod ext2
+
+if [ -s $prefix/grubenv ]; then
+  load_env
+fi
+
+if [ -z "$snappy_mode" ]; then
+    set snappy_mode=regular
+    save_env snappy_mode
+fi
+if [ -z "$snappy_ab" ]; then
+    set snappy_ab=a
+    save_env snappy_ab
+fi
+
+if [ "$snappy_mode" = "try" ]; then
+    if [ "$snappy_trial_boot" = "1" ]; then
+        # Previous boot failed to unset snappy_trial_boot, so toggle
+        # rootfs.
+        if [ "$snappy_ab" = "a" ]; then
+            set snappy_ab=b
+        else
+            set snappy_ab=a
+        fi
+        save_env snappy_ab
+    else
+        # Trial mode so set the snappy_trial_boot (which snappy is
+        # expected to unset).
+        #
+        # Note: don't use the standard recordfail variable since that forces
+        # the menu to be displayed and sets an infinite timeout if set.
+        set snappy_trial_boot=1
+        save_env snappy_trial_boot
+    fi
+fi
+
+set label="system-$snappy_ab"
+set cmdline="root=LABEL=$label ro init=/lib/systemd/systemd console=tty1 console=ttyS0 panic=-1"
+
+menuentry "$label" {
+    if [ -d "$prefix/$snappy_ab" ]; then
+        linux $prefix/$snappy_ab/vmlinuz $cmdline
+        initrd $prefix/$snappy_ab/initrd.img
+    else
+        # old-style kernel-in-os-partition
+        search --no-floppy --set --label "$label"
+        linux /vmlinuz $cmdline
+        initrd /initrd.img
+    fi
+}

=== modified file 'generic-amd64/meta/package.yaml'
--- generic-amd64/meta/package.yaml	2015-04-22 15:46:27 +0000
+++ generic-amd64/meta/package.yaml	2015-06-30 11:19:14 +0000
@@ -1,7 +1,7 @@
 name: generic-amd64
 vendor: Sergio Schvezov <[e-mail]>
 icon: meta/ubuntu.png
-version: 1.1
+version: 1.2
 type: oem
 
 config:
@@ -17,3 +17,6 @@
         bootloader: grub
         architecture: amd64
         partition-layout: system-AB
+        boot-assets:
+            files:
+                - path: grub.cfg

=== added file 'generic-i386/grub.cfg'
--- generic-i386/grub.cfg	1970-01-01 00:00:00 +0000
+++ generic-i386/grub.cfg	2015-06-30 11:19:14 +0000
@@ -0,0 +1,54 @@
+set default=0
+set timeout=3
+
+insmod part_gpt
+insmod ext2
+
+if [ -s $prefix/grubenv ]; then
+  load_env
+fi
+
+if [ -z "$snappy_mode" ]; then
+    set snappy_mode=regular
+    save_env snappy_mode
+fi
+if [ -z "$snappy_ab" ]; then
+    set snappy_ab=a
+    save_env snappy_ab
+fi
+
+if [ "$snappy_mode" = "try" ]; then
+    if [ "$snappy_trial_boot" = "1" ]; then
+        # Previous boot failed to unset snappy_trial_boot, so toggle
+        # rootfs.
+        if [ "$snappy_ab" = "a" ]; then
+            set snappy_ab=b
+        else
+            set snappy_ab=a
+        fi
+        save_env snappy_ab
+    else
+        # Trial mode so set the snappy_trial_boot (which snappy is
+        # expected to unset).
+        #
+        # Note: don't use the standard recordfail variable since that forces
+        # the menu to be displayed and sets an infinite timeout if set.
+        set snappy_trial_boot=1
+        save_env snappy_trial_boot
+    fi
+fi
+
+set label="system-$snappy_ab"
+set cmdline="root=LABEL=$label ro init=/lib/systemd/systemd console=tty1 console=ttyS0 panic=-1"
+
+menuentry "$label" {
+    if [ -d "$prefix/$snappy_ab" ]; then
+        linux $prefix/$snappy_ab/vmlinuz $cmdline
+        initrd $prefix/$snappy_ab/initrd.img
+    else
+        # old-style kernel-in-os-partition
+        search --no-floppy --set --label "$label"
+        linux /vmlinuz $cmdline
+        initrd /initrd.img
+    fi
+}

=== modified file 'generic-i386/meta/package.yaml'
--- generic-i386/meta/package.yaml	2015-06-04 12:57:49 +0000
+++ generic-i386/meta/package.yaml	2015-06-30 11:19:14 +0000
@@ -1,7 +1,7 @@
 name: generic-i386
 vendor: Sergio Schvezov <[e-mail]>
 icon: meta/ubuntu.png
-version: 1.1
+version: 1.2
 type: oem
 
 config:
@@ -17,3 +17,6 @@
         bootloader: grub
         architecture: i386
         partition-layout: system-AB
+        boot-assets:
+            files:
+                - path: grub.cfg