Merge ~sylvain-pineau/plainbox-provider-resource:bootloader_resource_lk into plainbox-provider-resource:master

[Sylvain Pineau]

Add lk support to bootloader_resource

[Jonathan Cave (jocave)]

Concerns described below...

[Jonathan Cave (jocave)]

After much discussion with Ondrej, the best method seems to be to use kernel_cmdline parser output to pick the parameter snap_kernel=<name>. The <name> value should be then be used to select the correct booting_matrix line in snap_boot_selection and the associated BOOTIMG_ is what should be returned.

[Sylvain Pineau (sylvain-pineau)]

Implemented the above solution based on the kernel_cmdline parser.

review: Needs Resubmitting

[Sylvain Pineau (sylvain-pineau)]

Tested on target system:

===========================[ Running Selected Jobs ]============================
--------------[ Running job 1 / 1. Estimated time left: 0:00:01 ]---------------
---------------[ Detect which bootloader is used on the device ]----------------
ID: com.canonical.certification::bootloader
Category: com.canonical.plainbox::uncategorised
... 8< -------------------------------------------------------------------------
name: lk
booted-kernel-path: /dev/disk/by-partlabel/BOOTIMG1
booted-kernel-partition-type: raw

------------------------------------------------------------------------- >8 ---
Outcome: job passed

review: Approve

diff --git a/bin/bootloader_resource.py b/bin/bootloader_resource.py
index 2ef1743..cc1fef3 100755
--- a/bin/bootloader_resource.py
+++ b/bin/bootloader_resource.py
@@ -16,6 +16,8 @@
 # along with Checkbox.  If not, see <http://www.gnu.org/licenses/>.
 
 import os
+import re
+import subprocess as sp
 
 from checkbox_support.parsers.kernel_cmdline import parse_kernel_cmdline
 
@@ -42,7 +44,7 @@ def booted_kernel_location(bl_name):
     type = 'unknown'
     if bl_name == 'uboot':
         pass
-    if bl_name == 'grub':
+    elif bl_name == 'grub':
         # what about force-kernel-extract true/false ?
         type = 'fs'
         with open('/proc/cmdline', 'r') as f:
@@ -50,10 +52,25 @@ def booted_kernel_location(bl_name):
         result = parse_kernel_cmdline(cmdline)
         grub_path = result.params['BOOT_IMAGE']
         path = os.path.join('/boot/efi', grub_path[grub_path.index(')')+2:])
-    if bl_name == 'androidboot':
+    elif bl_name == 'androidboot':
         pass
-    if bl_name == 'lk':
-        # get partlabel of actiave boot partition using `lk-boot-env -r`
+    elif bl_name == 'lk':
+        with open('/proc/cmdline', 'r') as f:
+            cmdline = f.readline()
+        result = parse_kernel_cmdline(cmdline)
+        snap_kernel = result.params['snap_kernel']
+        # get the bootimg matrix using `lk-boot-env -r`
+        try:
+            snap_boot_selection = sp.run(
+                ['lk-boot-env', '-r', os.path.join(*bootloaders['lk'])],
+                check=True, stdout=sp.PIPE).stdout.decode()
+            match = re.search(
+                'bootimg_matrix\s+\[(.*?)\]\[{}\]'.format(snap_kernel),
+                snap_boot_selection, re.M)
+            if match:
+                path = os.path.join(bootloaders['lk'][0], match.group(1))
+        except FileNotFoundError:
+            path = 'unknown'
         type = 'raw'
     return (path, type)
 
diff --git a/jobs/resource.pxu b/jobs/resource.pxu
index e786c77..9584e88 100644
--- a/jobs/resource.pxu
+++ b/jobs/resource.pxu
@@ -453,5 +453,6 @@ _description:
  device. This can help identify what boot security systems might be used.
 plugin: resource
 estimated_duration: 1.0
+user: root
 command:
   bootloader_resource.py