Skip to content

Commit d1eefa4

Browse files
committed
create_disk: Initialize stateroot earlier
We can do this earlier rather than intermixing it with the pull/deploy. Prep for further work.
1 parent 226dbc8 commit d1eefa4

File tree

1 file changed

+2
-1
lines changed

1 file changed

+2
-1
lines changed

src/create_disk.sh

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -247,6 +247,8 @@ fi
247247
# Now that we have the basic disk layout, initialize the basic
248248
# OSTree layout, load in the ostree commit and deploy it.
249249
ostree admin init-fs --modern $rootfs
250+
# Initialize the "stateroot"
251+
ostree admin os-init "$os_name" --sysroot $rootfs
250252
if [ "${rootfs_type}" = "ext4verity" ]; then
251253
ostree config --repo=$rootfs/ostree/repo set ex-fsverity.required 'true'
252254
fi
@@ -257,7 +259,6 @@ if test -n "${remote_name}"; then
257259
else
258260
deploy_ref=$commit
259261
fi
260-
ostree admin os-init "$os_name" --sysroot $rootfs
261262
# Note that $ignition_firstboot is interpreted by grub at boot time,
262263
# *not* the shell here. Hence the backslash escape.
263264
allkargs="$extrakargs \$ignition_firstboot"

0 commit comments

Comments
 (0)