From 8b3da9fa84b3913e1468af176977bb83ff1ea8c8 Mon Sep 17 00:00:00 2001 From: Jonathan Cave Date: Wed, 15 Apr 2020 17:33:41 +0100 Subject: booted_kernel_tests: fix for base core18 snaps Need to use snapd managed path to read hostfs --- bin/booted_kernel_tests.py | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) (limited to 'bin') diff --git a/bin/booted_kernel_tests.py b/bin/booted_kernel_tests.py index bff9ff9..f190d8d 100755 --- a/bin/booted_kernel_tests.py +++ b/bin/booted_kernel_tests.py @@ -9,7 +9,8 @@ import hashlib import os import sys -from checkbox_support.snap_utils.system import get_kernel_snap +from checkbox_support.snap_utils.system import ( + get_kernel_snap, add_hostfs_prefix) # 64kb buffer, hopefully suitable for all devices that might run this test BUF_SIZE = 65536 @@ -54,8 +55,9 @@ if __name__ == '__main__': booted_kernel_image = sys.argv[1] print('Supplied booted kernel image: {}'.format(booted_kernel_image)) + prefixed_image = add_hostfs_prefix(booted_kernel_image) - if not os.path.exists(booted_kernel_image): + if not os.path.exists(prefixed_image): raise SystemExit('ERROR: invalid path to booted kernel supplied') - sys.exit(kernel_matches_current(booted_kernel_image)) + sys.exit(kernel_matches_current(prefixed_image)) -- cgit v1.2.3