Skip to content

Commit

Permalink
create_disk: Use ostree admin init-fs --modern
Browse files Browse the repository at this point in the history
The OSTree version that contains it has long since been
released so we can use it now.
  • Loading branch information
cgwalters authored and openshift-merge-robot committed Apr 29, 2020
1 parent 3094bfb commit 16f1c55
Showing 1 changed file with 3 additions and 8 deletions.
11 changes: 3 additions & 8 deletions src/create_disk.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

0 comments on commit 16f1c55

Please sign in to comment.