From 81bc59019ce55daaf01f7bd383b4ab64254d6e5d Mon Sep 17 00:00:00 2001
From: Olivier Gayot <olivier.gayot@canonical.com>
Date: Thu, 20 Jan 2022 11:59:48 +0100
Subject: [PATCH] Remove --use-fuse switch and make it the default

Signed-off-by: Olivier Gayot <olivier.gayot@canonical.com>
---
 Makefile            |  3 ++-
 scripts/kvm-test.py | 21 ++++-----------------
 2 files changed, 6 insertions(+), 18 deletions(-)

diff --git a/Makefile b/Makefile
index 82c85d11..c4f66fa7 100644
--- a/Makefile
+++ b/Makefile
@@ -30,7 +30,8 @@ aptdeps:
 		libnl-route-3-dev python3-attr python3-distutils-extra python3-requests \
 		python3-requests-unixsocket python3-jsonschema python3-apport \
 		python3-bson xorriso isolinux python3-aiohttp cloud-init ssh-import-id \
-		curl jq build-essential python3-pytest python3-async-timeout language-selector-common
+		curl jq build-essential python3-pytest python3-async-timeout \
+	        language-selector-common fuseiso
 
 .PHONY: install_deps
 install_deps: aptdeps gitdeps
diff --git a/scripts/kvm-test.py b/scripts/kvm-test.py
index f82fec07..b7d78bf4 100755
--- a/scripts/kvm-test.py
+++ b/scripts/kvm-test.py
@@ -174,8 +174,6 @@ parser.add_argument('--install', default=False, action='store_true',
                     iso, use a base iso, or reuse previous test iso''')
 parser.add_argument('--boot', default=False, action='store_true',
                     help='boot test image')
-parser.add_argument('--use-fuse', default=False, action='store_true',
-                    help="use FUSE to mount ISO (doesn't require root)")
 
 
 def parse_args():
@@ -231,23 +229,12 @@ def noop(path):
 
 
 @contextlib.contextmanager
-def mounter(src, dest, use_fuse: bool = False):
-    commands_with_fuse = (
-        ["fuseiso", src, dest],
-        ["fusermount", "-u", dest],
-    )
-    commands_without_fuse = (
-        f'sudo mount -r {src} {dest}',
-        f'sudo umount {dest}',
-    )
-
-    mount, unmount = commands_with_fuse if use_fuse else commands_without_fuse
-
-    run(mount)
+def mounter(src, dest):
+    run(["fuseiso", src, dest])
     try:
         yield
     finally:
-        run(unmount)
+        run(["fusermount", "-u", dest])
 
 
 def livefs_edit(ctx, *args):
@@ -439,7 +426,7 @@ def install(ctx):
             run(f'qemu-img create -f qcow2 {ctx.target} {ctx.args.disksize}')
 
         if len(appends) > 0:
-            with mounter(iso, mntdir, ctx.args.use_fuse):
+            with mounter(iso, mntdir):
                 # if we're passing kernel args, we need to manually specify
                 # kernel / initrd
                 kvm.extend(('-kernel', f'{mntdir}/casper/vmlinuz'))