Remove --use-fuse switch and make it the default
Signed-off-by: Olivier Gayot <olivier.gayot@canonical.com>
This commit is contained in:
parent
f1119b02a6
commit
81bc59019c
3
Makefile
3
Makefile
|
@ -30,7 +30,8 @@ aptdeps:
|
||||||
libnl-route-3-dev python3-attr python3-distutils-extra python3-requests \
|
libnl-route-3-dev python3-attr python3-distutils-extra python3-requests \
|
||||||
python3-requests-unixsocket python3-jsonschema python3-apport \
|
python3-requests-unixsocket python3-jsonschema python3-apport \
|
||||||
python3-bson xorriso isolinux python3-aiohttp cloud-init ssh-import-id \
|
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
|
.PHONY: install_deps
|
||||||
install_deps: aptdeps gitdeps
|
install_deps: aptdeps gitdeps
|
||||||
|
|
|
@ -174,8 +174,6 @@ parser.add_argument('--install', default=False, action='store_true',
|
||||||
iso, use a base iso, or reuse previous test iso''')
|
iso, use a base iso, or reuse previous test iso''')
|
||||||
parser.add_argument('--boot', default=False, action='store_true',
|
parser.add_argument('--boot', default=False, action='store_true',
|
||||||
help='boot test image')
|
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():
|
def parse_args():
|
||||||
|
@ -231,23 +229,12 @@ def noop(path):
|
||||||
|
|
||||||
|
|
||||||
@contextlib.contextmanager
|
@contextlib.contextmanager
|
||||||
def mounter(src, dest, use_fuse: bool = False):
|
def mounter(src, dest):
|
||||||
commands_with_fuse = (
|
run(["fuseiso", src, dest])
|
||||||
["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)
|
|
||||||
try:
|
try:
|
||||||
yield
|
yield
|
||||||
finally:
|
finally:
|
||||||
run(unmount)
|
run(["fusermount", "-u", dest])
|
||||||
|
|
||||||
|
|
||||||
def livefs_edit(ctx, *args):
|
def livefs_edit(ctx, *args):
|
||||||
|
@ -439,7 +426,7 @@ def install(ctx):
|
||||||
run(f'qemu-img create -f qcow2 {ctx.target} {ctx.args.disksize}')
|
run(f'qemu-img create -f qcow2 {ctx.target} {ctx.args.disksize}')
|
||||||
|
|
||||||
if len(appends) > 0:
|
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
|
# if we're passing kernel args, we need to manually specify
|
||||||
# kernel / initrd
|
# kernel / initrd
|
||||||
kvm.extend(('-kernel', f'{mntdir}/casper/vmlinuz'))
|
kvm.extend(('-kernel', f'{mntdir}/casper/vmlinuz'))
|
||||||
|
|
Loading…
Reference in New Issue