“Canonical Kernel Team” team

Merge ~canonical-kernel-team/+git/autotest-client-tests:phlin/bt-config-core into ~canonical-kernel-team/+git/autotest-client-tests:master

  1. Git
  2. lp:~canonical-kernel-team/+git/autotest-client-tests
  3. phlin/bt-config-core
  4. Merge into master
Proposed by Po-Hsu Lin
Status: Merged
Merge reported by: Po-Hsu Lin
Merged at revision: 3e24d04a24064ea55017efca89e76a18d20f6dac
Proposed branch: ~canonical-kernel-team/+git/autotest-client-tests:phlin/bt-config-core
Merge into: ~canonical-kernel-team/+git/autotest-client-tests:master
Diff against target: 15 lines (+4/-0)
1 file modified
ubuntu_boot/kernel_revocation_list.py (+4/-0)
Reviewer Review Type Date Requested Status
Francis Ginther Approve
Review via email: mp+465561@code.launchpad.net

Commit message

KERNTT-464
The config files for Ubuntu Core system is located in /run/mnt/kernel/,
try to read it if the /boot/config-$KV files does not exist.

To post a comment you must log in.
Revision history for this message
Francis Ginther (fginther) wrote :

Looks reasonable.

review: Approve
Revision history for this message
Po-Hsu Lin (cypressyew) wrote :

Applied and pushed, thanks!

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1diff --git a/ubuntu_boot/kernel_revocation_list.py b/ubuntu_boot/kernel_revocation_list.py
2index 83ddc83..c602ea4 100755
3--- a/ubuntu_boot/kernel_revocation_list.py
4+++ b/ubuntu_boot/kernel_revocation_list.py
5@@ -10,6 +10,10 @@ class TestRevocationList(unittest.TestCase):
6 @classmethod
7 def setUpClass(cls):
8 config_file = "/boot/config-" + os.uname()[2]
9+ # For Ubuntu Core
10+ if not os.path.isfile(config_file):
11+ config_file = "/run/mnt/kernel/config-"+ os.uname()[2]
12+
13 revocation_list_available = False
14 with open(config_file) as f:
15 for line in f:

Subscribers

People subscribed via source and target branches

to all changes: