snappy-hub

Merge lp:~chipaca/snappy-hub/grub-tweaks into lp:~snappy-dev/snappy-hub/snappy-systems

  1. grub-tweaks
  2. Merge into snappy-systems
Proposed by John Lenton on 2015-07-01
Status: Merged
Approved by: Sergio Schvezov on 2015-07-02
Approved revision: 6
Merged at revision: 7
Proposed branch: lp:~chipaca/snappy-hub/grub-tweaks
Merge into: lp:~snappy-dev/snappy-hub/snappy-systems
Diff against target: 41 lines (+2/-4)
2 files modified
generic-amd64/grub.cfg (+1/-2)
generic-i386/grub.cfg (+1/-2)
To merge this branch: bzr merge lp:~chipaca/snappy-hub/grub-tweaks
Reviewer Review Type Date Requested Status
Sergio Schvezov 2015-07-01 Approve on 2015-07-02
Review via email: mp+263544@code.launchpad.net

Commit Message

make ttyS0 not be console on intel; drop spurious search

To post a comment you must log in.
Sergio Schvezov (sergiusens) :
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-01 16:33:21 +0000
4@@ -39,7 +39,7 @@
5 fi
6
7 set label="system-$snappy_ab"
8-set cmdline="root=LABEL=$label ro init=/lib/systemd/systemd console=tty1 console=ttyS0 panic=-1"
9+set cmdline="root=LABEL=$label ro init=/lib/systemd/systemd console=ttyS0 console=tty1 panic=-1"
10
11 menuentry "$label" {
12 if [ -d "$prefix/$snappy_ab" ]; then
13@@ -47,7 +47,6 @@
14 initrd $prefix/$snappy_ab/initrd.img
15 else
16 # old-style kernel-in-os-partition
17- search --no-floppy --set --label "$label"
18 linux /vmlinuz $cmdline
19 initrd /initrd.img
20 fi
21
22=== modified file 'generic-i386/grub.cfg'
23--- generic-i386/grub.cfg 2015-06-30 11:18:37 +0000
24+++ generic-i386/grub.cfg 2015-07-01 16:33:21 +0000
25@@ -39,7 +39,7 @@
26 fi
27
28 set label="system-$snappy_ab"
29-set cmdline="root=LABEL=$label ro init=/lib/systemd/systemd console=tty1 console=ttyS0 panic=-1"
30+set cmdline="root=LABEL=$label ro init=/lib/systemd/systemd console=ttyS0 console=tty1 panic=-1"
31
32 menuentry "$label" {
33 if [ -d "$prefix/$snappy_ab" ]; then
34@@ -47,7 +47,6 @@
35 initrd $prefix/$snappy_ab/initrd.img
36 else
37 # old-style kernel-in-os-partition
38- search --no-floppy --set --label "$label"
39 linux /vmlinuz $cmdline
40 initrd /initrd.img
41 fi

Subscribers

People subscribed via source and target branches