charm-sysconfig

Merge ~bcarbone/charm-sysconfig:bug/lp1967179 into charm-sysconfig:master

  1. Git
  2. lp:~bcarbone/charm-sysconfig
  3. bug/lp1967179
  4. Merge into master
Proposed by Bayani Carbone
Status: Merged
Approved by: Przemyslaw Lal
Approved revision: ae14fd84cbad87f16fda0f42663d8487d2374966
Merged at revision: 3a9135618c056708c8646c0c70dcbc5f56cf0900
Proposed branch: ~bcarbone/charm-sysconfig:bug/lp1967179
Merge into: charm-sysconfig:master
Diff against target: 12 lines (+0/-1)
1 file modified
src/templates/grub.j2 (+0/-1)
Reviewer Review Type Date Requested Status
Xav Paice (community) Approve
🤖 prod-jenkaas-bootstack (community) continuous-integration Approve
BootStack Reviewers Pending
Review via email: mp+417994@code.launchpad.net

Commit message

Prevent overwrite of GRUB_CMDLINE_LINUX

Description of the change

Fixes LP1967179 by removing GRUB_CMDLINE_LINUX="" from src/templates/grub.j2.

To test:
  - deploy the ubuntu charm
  - manually add a parameter to GRUB_CMDLINE_LINUX in /etc/default/grub
  - run update-grub
  - confirm parameter is present in /boot/grub/grub.cfg
  - deploy the sysconfig charm
  - relate ubuntu app to sysconfig app
  - run update-grub once sysconfig is installed
  - validate that parameter added to /etc/default/grub is still present in /boot/grub/grub.cfg

To post a comment you must log in.
Revision history for this message
🤖 prod-jenkaas-bootstack (prod-jenkaas-bootstack) wrote :

A CI job is currently in progress. A follow up comment will be added when it completes.

Revision history for this message
🤖 Canonical IS Merge Bot (canonical-is-mergebot) wrote :

This merge proposal is being monitored by mergebot. Change the status to Approved to merge.

Revision history for this message
🤖 prod-jenkaas-bootstack (prod-jenkaas-bootstack) wrote :

PASSED: Continuous integration, rev:ae14fd84cbad87f16fda0f42663d8487d2374966
https://jenkins.canonical.com/bootstack/job/lp-charm-sysconfig-ci/33/
Executed test runs:
    SUCCESS: https://jenkins.canonical.com/bootstack/job/lp-charm-test-functest/729/
    None: https://jenkins.canonical.com/bootstack/job/lp-update-mp/1197/

Click here to trigger a rebuild:
https://jenkins.canonical.com/bootstack/job/lp-charm-sysconfig-ci/33//rebuild

review: Approve (continuous-integration)
Revision history for this message
Xav Paice (xavpaice) wrote :

LGTM

review: Approve
Revision history for this message
🤖 Canonical IS Merge Bot (canonical-is-mergebot) wrote :

Change successfully merged at revision 3a9135618c056708c8646c0c70dcbc5f56cf0900

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1diff --git a/src/templates/grub.j2 b/src/templates/grub.j2
2index f192676..a76ca57 100644
3--- a/src/templates/grub.j2
4+++ b/src/templates/grub.j2
5@@ -45,7 +45,6 @@ GRUB_CMDLINE_LINUX_DEFAULT="$GRUB_CMDLINE_LINUX_DEFAULT tsx=on tsx_async_abort=o
6 {% if grub_default is defined and grub_default -%}
7 GRUB_DEFAULT="{{ grub_default }}"
8 {% endif -%}
9-GRUB_CMDLINE_LINUX=""
10
11 # Uncomment to disable graphical terminal (grub-pc only)
12 #GRUB_TERMINAL=console

Subscribers

People subscribed via source and target branches

to all changes: