From 223f5f72d95cd1e9256eb51a9b9df4c4fc6e8cb7 Mon Sep 17 00:00:00 2001 From: Sylvain Pineau Date: Tue, 10 Sep 2019 13:38:33 +0200 Subject: fde_test.py: Fix mount point discovery on core18 the writable partition is not /writable but /var/lib/snapd/hostfs/writable/ on core18. findfs LABEL=writable works on both core16 and core18. --- bin/fde_tests.py | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/bin/fde_tests.py b/bin/fde_tests.py index 3008735f..fd9ea141 100755 --- a/bin/fde_tests.py +++ b/bin/fde_tests.py @@ -28,7 +28,10 @@ def main(): base_mount = '/' if on_desktop else '/writable' # discover the underlying mount point for the encrypted part - cmd = 'findmnt {} -n -o SOURCE'.format(base_mount) + if on_desktop: + cmd = 'findmnt {} -n -o SOURCE'.format(base_mount) + else: + cmd = 'findfs LABEL=writable' print('+ {}'.format(cmd)) try: source = sp.check_output(cmd, shell=True).decode( -- cgit v1.2.3