snappy-hub

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

  1. searchForMe
  2. Merge into snappy-systems
Proposed by Sergio Schvezov on 2015-07-03
Status: Merged
Approved by: John Lenton on 2015-07-03
Approved revision: 8
Merged at revision: 8
Proposed branch: lp:~sergiusens/snappy-hub/searchForMe
Merge into: lp:~snappy-dev/snappy-hub/snappy-systems
Diff against target: 49 lines (+4/-2)
4 files modified
generic-amd64/grub.cfg (+1/-0)
generic-amd64/meta/package.yaml (+1/-1)
generic-i386/grub.cfg (+1/-0)
generic-i386/meta/package.yaml (+1/-1)
To merge this branch: bzr merge lp:~sergiusens/snappy-hub/searchForMe
Reviewer Review Type Date Requested Status
John Lenton 2015-07-03 Approve on 2015-07-03
Review via email: mp+263772@code.launchpad.net

Commit Message

Adding back the search for the label to set correctly

To post a comment you must log in.
John Lenton (chipaca) wrote :

Once again, IRL testing beats docs. Thank you.

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-07-02 23:12:50 +0000
3+++ generic-amd64/grub.cfg 2015-07-03 12:53:01 +0000
4@@ -47,6 +47,7 @@
5 initrd $prefix/$snappy_ab/initrd.img
6 else
7 # old-style kernel-in-os-partition
8+ search --no-floppy --set --label "$label"
9 linux /vmlinuz $cmdline
10 initrd /initrd.img
11 fi
12
13=== modified file 'generic-amd64/meta/package.yaml'
14--- generic-amd64/meta/package.yaml 2015-06-30 11:18:37 +0000
15+++ generic-amd64/meta/package.yaml 2015-07-03 12:53:01 +0000
16@@ -1,7 +1,7 @@
17 name: generic-amd64
18 vendor: Sergio Schvezov <sergio.schvezov@canonical.com>
19 icon: meta/ubuntu.png
20-version: 1.2
21+version: 1.4
22 type: oem
23
24 config:
25
26=== modified file 'generic-i386/grub.cfg'
27--- generic-i386/grub.cfg 2015-07-02 23:12:50 +0000
28+++ generic-i386/grub.cfg 2015-07-03 12:53:01 +0000
29@@ -47,6 +47,7 @@
30 initrd $prefix/$snappy_ab/initrd.img
31 else
32 # old-style kernel-in-os-partition
33+ search --no-floppy --set --label "$label"
34 linux /vmlinuz $cmdline
35 initrd /initrd.img
36 fi
37
38=== modified file 'generic-i386/meta/package.yaml'
39--- generic-i386/meta/package.yaml 2015-06-30 11:18:37 +0000
40+++ generic-i386/meta/package.yaml 2015-07-03 12:53:01 +0000
41@@ -1,7 +1,7 @@
42 name: generic-i386
43 vendor: Sergio Schvezov <sergio.schvezov@canonical.com>
44 icon: meta/ubuntu.png
45-version: 1.2
46+version: 1.4
47 type: oem
48
49 config:

Subscribers

People subscribed via source and target branches