snappy-hub

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

  1. refinedGrub
  2. Merge into snappy-systems
Proposed by Sergio Schvezov
Status: Merged
Approved by: John Lenton
Approved revision: 6
Merged at revision: 6
Proposed branch: lp:~sergiusens/snappy-hub/refinedGrub
Merge into: lp:~snappy-dev/snappy-hub/snappy-systems
Diff against target: 25 lines (+2/-2)
2 files modified
generic-amd64/grub.cfg (+1/-1)
generic-i386/grub.cfg (+1/-1)
To merge this branch: bzr merge lp:~sergiusens/snappy-hub/refinedGrub
Reviewer Review Type Date Requested Status
John Lenton (community) Approve
Review via email: mp+263729@code.launchpad.net

Commit message

Refine check for snappy-[a|b] kernels

To post a comment you must log in.
Revision history for this message
John Lenton (chipaca) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'generic-amd64/grub.cfg'
2--- generic-amd64/grub.cfg 2015-06-30 11:18:37 +0000
3+++ generic-amd64/grub.cfg 2015-07-02 23:06:24 +0000
4@@ -42,7 +42,7 @@
5 set cmdline="root=LABEL=$label ro init=/lib/systemd/systemd console=tty1 console=ttyS0 panic=-1"
6
7 menuentry "$label" {
8- if [ -d "$prefix/$snappy_ab" ]; then
9+ if [ -e "$prefix/$snappy_ab/vmlinuz" ]; then
10 linux $prefix/$snappy_ab/vmlinuz $cmdline
11 initrd $prefix/$snappy_ab/initrd.img
12 else
13
14=== modified file 'generic-i386/grub.cfg'
15--- generic-i386/grub.cfg 2015-06-30 11:18:37 +0000
16+++ generic-i386/grub.cfg 2015-07-02 23:06:24 +0000
17@@ -42,7 +42,7 @@
18 set cmdline="root=LABEL=$label ro init=/lib/systemd/systemd console=tty1 console=ttyS0 panic=-1"
19
20 menuentry "$label" {
21- if [ -d "$prefix/$snappy_ab" ]; then
22+ if [ -e "$prefix/$snappy_ab/vmlinuz" ]; then
23 linux $prefix/$snappy_ab/vmlinuz $cmdline
24 initrd $prefix/$snappy_ab/initrd.img
25 else

Subscribers

People subscribed via source and target branches