diff options
| author | Sylvain Pineau <sylvain.pineau@canonical.com> | 2019-09-10 13:38:33 +0200 |
|---|---|---|
| committer | Sylvain Pineau <sylvain.pineau@canonical.com> | 2019-09-10 13:38:33 +0200 |
| commit | 223f5f72d95cd1e9256eb51a9b9df4c4fc6e8cb7 (patch) | |
| tree | 6c9577fbe26b5b774ca65b0f2f5379c4731b2bea /bin | |
| parent | 65fa64b17f2dc63afbbf6fbe4a6120f09adf49f8 (diff) | |
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.
Diffstat (limited to 'bin')
| -rwxr-xr-x | bin/fde_tests.py | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/bin/fde_tests.py b/bin/fde_tests.py index 3008735..fd9ea14 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( |