From f6039d7f87605f18275ec8bb607d9c15c7d7a72f Mon Sep 17 00:00:00 2001
From: Jakob Meng <code@jakobmeng.de>
Date: Wed, 13 Sep 2023 14:56:11 +0200
Subject: [PATCH] [DNM][DRAFT] Agent-based Installer test for OKD/FCOS

---
 .../files/usr/local/bin/bootstrap-pivot.sh.template  | 12 ++----------
 1 file changed, 2 insertions(+), 10 deletions(-)

diff --git a/data/data/bootstrap/files/usr/local/bin/bootstrap-pivot.sh.template b/data/data/bootstrap/files/usr/local/bin/bootstrap-pivot.sh.template
index 86a42bb9cc2..2f4aefc980f 100644
--- a/data/data/bootstrap/files/usr/local/bin/bootstrap-pivot.sh.template
+++ b/data/data/bootstrap/files/usr/local/bin/bootstrap-pivot.sh.template
@@ -42,12 +42,10 @@ if [ ! -f /opt/openshift/.pivot-done ]; then
   record_service_stage_start "rebase-to-okd-os-image"
 {{if .IsFCOS -}}
   mnt="$(podman image mount "${MACHINE_OS_IMAGE}")"
-{{- if .BootstrapInPlace }}
-  # SNO setup boots into Live ISO which cannot be rebased
-  # https://github.com/coreos/rpm-ostree/issues/4547
+
   mkdir /var/mnt/{upper,worker}
   mount -t overlay overlay -o "lowerdir=/usr:$mnt/usr" /usr
-  mount -t overlay overlay -o "lowerdir=/etc:$mnt/etc,upperdir=/var/mnt/upper,workdir=/var/mnt/worker" /etc
+  rsync -rltv --ignore-existing "$mnt/etc/" /etc/
   systemctl daemon-reload
 
   # Workaround for SELinux denials when launching crio.service from overlayfs
@@ -55,12 +53,6 @@ if [ ! -f /opt/openshift/.pivot-done ]; then
 
   systemctl start crio.service
   # No reboot necessary because SNO setup will reboot system
-{{ else }}
-  pushd "${mnt}/bootstrap"
-    # shellcheck disable=SC1091
-    . ./pre-pivot.sh
-  popd
-{{ end -}}
 {{else if .IsSCOS -}}
   chmod 0644 /etc/containers/registries.conf
   rpm-ostree rebase --experimental "ostree-unverified-registry:${MACHINE_OS_IMAGE}"