Snappy

Merge lp:~sergiusens/snappy/cmdline into lp:~snappy-dev/snappy/snappy-moved-to-github

  1. cmdline
  2. Merge into snappy-moved-to-github
Proposed by Sergio Schvezov on 2015-06-08
Status: Merged
Approved by: Ricardo Salveti on 2015-06-08
Approved revision: 491
Merged at revision: 490
Proposed branch: lp:~sergiusens/snappy/cmdline
Merge into: lp:~snappy-dev/snappy/snappy-moved-to-github
Diff against target: 14 lines (+2/-2)
1 file modified
etc/grub.d/09_snappy (+2/-2)
To merge this branch: bzr merge lp:~sergiusens/snappy/cmdline
Reviewer Review Type Date Requested Status
Ricardo Salveti (community) Approve on 2015-06-08
John Lenton 2015-06-08 Approve on 2015-06-08
Review via email: mp+261443@code.launchpad.net

Commit Message

Fix shell script for 09_snappy

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

😓

review: Approve
Ricardo Salveti (rsalveti) wrote :

Looks good.

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'etc/grub.d/09_snappy'
2--- etc/grub.d/09_snappy 2015-06-08 18:44:10 +0000
3+++ etc/grub.d/09_snappy 2015-06-08 19:17:06 +0000
4@@ -157,8 +157,8 @@
5
6 # Composes and returns a kernel cmd line
7 get_cmdline() {
8- channels_ini = "/etc/system-image/channels.ini"
9- grep -q 'device: azure_amd64' "$channels_ini" && azure_cmdline="rootdelay=300"
10+ channel_ini="/etc/system-image/channel.ini"
11+ grep -q 'device: azure_amd64' "$channel_ini" && azure_cmdline="rootdelay=300"
12
13 echo "${GRUB_CMDLINE_LINUX} ${GRUB_CMDLINE_LINUX_DEFAULT} $azure_cmdline"
14 }

Subscribers

People subscribed via source and target branches