Merge branch 'image' into 'master'

Image

See merge request larswirzenius/contractor!20

2 files changed, 5 insertions, 2 deletions

diff --git a/contractor b/contractor
index 2bc0fe7..66693ed 100755
--- a/contractor
+++ b/contractor
@@ -709,10 +709,13 @@ def main():
     build.set_defaults(func=cmd_build, **manager_defaults)
 
     args = p.parse_args()
+    cli_v = args.verbose
     if args.use_default_config:
         load_default_config(args)
     if args.config:
         load_config(args.config, args)
+    if cli_v:
+        args.verbose = True
     setup_logging(args)
     args.func(args)
 
diff --git a/worker.vmdb b/worker.vmdb
index 264f7b8..5db8407 100644
--- a/worker.vmdb
+++ b/worker.vmdb
@@ -18,8 +18,6 @@ steps:
 
   - mount: /
 
-  - virtual-filesystems: /
-
   - unpack-rootfs: /
 
   - debootstrap: buster
@@ -27,6 +25,8 @@ steps:
     target: /
     unless: rootfs_unpacked
 
+  - virtual-filesystems: /
+
   - apt: install
     packages:
     - linux-image-amd64