From 16f1c55610ea73e01339a5f5b15cba0142aa0328 Mon Sep 17 00:00:00 2001
From: Colin Walters <walters@verbum.org>
Date: Tue, 28 Apr 2020 21:05:22 +0000
Subject: [PATCH] create_disk: Use ostree admin init-fs --modern

The OSTree version that contains it has long since been
released so we can use it now.
---
 src/create_disk.sh | 11 +++--------
 1 file changed, 3 insertions(+), 8 deletions(-)

diff --git a/src/create_disk.sh b/src/create_disk.sh
index 8820a978aa..43cebe8bcd 100755
--- a/src/create_disk.sh
+++ b/src/create_disk.sh
@@ -242,15 +242,10 @@ if [ ${EFIPN:+x} ]; then
        mount "${disk}${EFIPN}" $rootfs/boot/efi
 fi
 
-
-# Initialize the ostree setup; TODO replace this with
-# https://github.com/ostreedev/ostree/pull/1894
-# `ostree admin init-fs --modern`
+# Now that we have the basic disk layout, initialize the basic
+# OSTree layout, load in the ostree commit and deploy it.
 ostree_commit=$(ostree --repo="${ostree}" rev-parse "${ref}")
-mkdir -p $rootfs/ostree
-chcon $(matchpathcon -n /ostree) $rootfs/ostree
-mkdir -p $rootfs/ostree/{repo,deploy}
-ostree --repo=$rootfs/ostree/repo init --mode=bare
+ostree admin init-fs --modern $rootfs
 if [ "${rootfs_type}" = "ext4verity" ]; then
     ostree config --repo=$rootfs/ostree/repo set ex-fsverity.required 'true'
 fi