From ce2276583adce6a1c5be579bc6388478b3188332 Mon Sep 17 00:00:00 2001 From: Dor Askayo Date: Fri, 13 Jan 2023 10:28:30 +0200 Subject: [PATCH 1/2] Mention bubblewrap mode in error messages --- rootfs.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/rootfs.py b/rootfs.py index 70485477..82729fd0 100755 --- a/rootfs.py +++ b/rootfs.py @@ -104,9 +104,10 @@ def main(): return count if check_types() > 1: - raise ValueError("No more than one of qemu, chroot, minikernel, bare metal may be used.") + raise ValueError("No more than one of qemu, chroot, bwrap, minikernel, bare metal " + "may be used.") if check_types() == 0: - raise ValueError("One of qemu, chroot, minikernel or bare metal must be selected.") + raise ValueError("One of qemu, chroot, bwrap, minikernel or bare metal must be selected.") if args.bare_metal: args.no_create_config = True From 808fc67cbdb99e79874a3bf0333ea3d849af6d01 Mon Sep 17 00:00:00 2001 From: Dor Askayo Date: Fri, 13 Jan 2023 10:39:52 +0200 Subject: [PATCH 2/2] Small addition of bubblewrap mode to documentation --- README.rst | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/README.rst b/README.rst index 39cf5015..49eca8ca 100644 --- a/README.rst +++ b/README.rst @@ -156,8 +156,8 @@ sysc sysc is the (current) last 'system' of live-bootstrap. This is a continuation from sysb, executed through util-linux's ``switch_root`` command which moves the entire rootfs without a reboot. Every package from here on out is compiled -under this system, taking binaries from sysa. Chroot mode skips sysb, as it -is obviously irrelevant for a chroot. +under this system, taking binaries from sysa. Chroot and bubblewrap modes skip +sysb, as it is obviously irrelevant to them. Python-less build -----------------