summaryrefslogtreecommitdiff
path: root/v-i
diff options
context:
space:
mode:
Diffstat (limited to 'v-i')
-rwxr-xr-xv-i15
1 files changed, 7 insertions, 8 deletions
diff --git a/v-i b/v-i
index c8beaaf..8bdd6dd 100755
--- a/v-i
+++ b/v-i
@@ -299,6 +299,12 @@ def vmdb_spec(system, ansible_vars):
# ext4 seems like a safe choice. If you wanted another file
# system, sorry.
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"),
]
)
@@ -314,8 +320,6 @@ def vmdb_spec(system, ansible_vars):
steps.extend(
[
- # Mount the root file system.
- mount("root"),
# If we have a cached version of the installed system, unpack
# it now. Otherwise do nothing. Note that if you make any
# changes to the steps marked "unless: rootfs_unpacked", you
@@ -341,13 +345,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"),
+ # This MUST be after the debootstrap step.
virtual_filesystems("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"),
# Create /etc/fstab (and, if LUKS is used, /etc/crypttab).
fstab("root"),
# These MUST come after the fstab step so that they add the