Merge branch 'debug' into 'main'

Revert "fix: don't mount anything on root before debootstrap is run"

See merge request larswirzenius/v-i!26

1 files changed, 6 insertions, 6 deletions

diff --git a/v-i b/v-i
index 0e38cc6..0f734e8 100755
--- a/v-i
+++ b/v-i
@@ -301,6 +301,10 @@ def vmdb_spec(system, ansible_vars):
             mkfs("root", "ext4"),
             # Mount the root file system.
             mount("root"),
+            # Mount /boot on top of the root file system.
+            mount("boot", dirname="/boot", mount_on="root"),
+            # Mount /boot/efi.
+            mount("efi", dirname="/boot/efi", mount_on="boot"),
         ]
     )
 
@@ -342,12 +346,8 @@ def vmdb_spec(system, ansible_vars):
             # If we didn't unpack an existing cache archive, make one now.
             # Otherwise, skip this step.
             cache_rootfs("root"),
-            # Mount /boot on top of the root file system. This MUST be done after the
-            # debootstrap step: otherwise the root file system isn't empty, and then
-            # debootstrap fails.
-            mount("boot", dirname="/boot", mount_on="root"),
-            # Mount /boot/efi.
-            mount("efi", dirname="/boot/efi", mount_on="boot"),
+            # This MUST be after the debootstrap step.
+            virtual_filesystems("root"),
             # Create /etc/fstab (and, if LUKS is used, /etc/crypttab).
             fstab("root"),
             # These MUST come after the fstab step so that they add the