From 10b541beb053a3010e8b3db33dafa9314bbb7130 Mon Sep 17 00:00:00 2001
From: Florian Wilhelm <florian.wilhelm02@sap.com>
Date: Thu, 21 Sep 2023 15:02:11 +0200
Subject: [PATCH] Change order of ostree init/initfs

see ostreedev/ostree#3055
---
 features/ostree/exec.late        | 2 +-
 features/ostree/image.ostree.raw | 5 +++--
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/features/ostree/exec.late b/features/ostree/exec.late
index 4e89ba4..fac86cf 100755
--- a/features/ostree/exec.late
+++ b/features/ostree/exec.late
@@ -34,7 +34,7 @@ ln -sf var/roothome root
 
 ln -s sysroot/ostree ostree
 
-echo $(date) > /timestamp
+echo $(date --utc +%Y-%m-%dT%H:%M:%S%Z) > /timestamp
 
 mkdir -p /boot/efi/Default
 
diff --git a/features/ostree/image.ostree.raw b/features/ostree/image.ostree.raw
index 4ec5f8c..bf14c44 100755
--- a/features/ostree/image.ostree.raw
+++ b/features/ostree/image.ostree.raw
@@ -21,11 +21,12 @@ tar xf "$rootfs" -C "$rootfs_work"
 
 mv "$rootfs_work"/etc "$rootfs_work"/usr/etc
 
-ostree admin init-fs --modern $OSTREE_SYSROOT
+mkdir -p $OSTREE_REPO
 ostree init --mode=archive --repo=$OSTREE_REPO
+ostree admin init-fs --modern $OSTREE_SYSROOT
 ostree admin os-init --sysroot=$OSTREE_SYSROOT gardenlinux
 ostree config --repo=$OSTREE_REPO set sysroot.bootloader none
-ostree commit --repo=$OSTREE_REPO --branch $OSTREE_REF --skip-if-unchanged -s "Debian testing build $(date)" "$rootfs_work"
+ostree commit --repo=$OSTREE_REPO --branch $OSTREE_REF --skip-if-unchanged -s "Debian testing build $(date --utc +%Y-%m-%dT%H:%M:%S%Z)" "$rootfs_work"
 ostree remote --repo=$OSTREE_REPO add --no-gpg-verify --no-sign-verify origin http://172.16.48.131:8000 $OSTREE_REF # fixme: hardcoded ip address
 ostree admin deploy --karg=root=LABEL=ROOT --karg-append=rw --karg-append=efi=runtime --karg-append=systemd.journald.forward_to_console=1 --sysroot=$OSTREE_SYSROOT --os=gardenlinux $OSTREE_REF