From 7abac3cb64e3eaff02f8c5b0f4d6a62c69a46958 Mon Sep 17 00:00:00 2001
From: Renata Ravanelli <rravanel@redhat.com>
Date: Mon, 25 Jul 2022 12:19:03 -0300
Subject: [PATCH 1/2] manifest: Pin systemd version

- The RHCOS CI is failing due an update in systemd,
let's pin it until we can solve it

More info: https://bugzilla.redhat.com/show_bug.cgi?id=2109546
---
 manifest.yaml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/manifest.yaml b/manifest.yaml
index 866fc24e5..45859f0b3 100644
--- a/manifest.yaml
+++ b/manifest.yaml
@@ -223,6 +223,8 @@ packages:
  # Used on the bootstrap node
  - systemd-journal-remote
  # Extras
+ # Pin systemd version until we solve https://bugzilla.redhat.com/show_bug.cgi?id=2109546
+ - "'systemd <= 239-45.el8_4.10'"
  - systemd-journal-gateway
  # RHEL7 compatibility
  - compat-openssl10

From 913005910c5765a3c9abd0dd2b59038214d3c6f3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Timoth=C3=A9e=20Ravier?= <tim@siosm.fr>
Date: Wed, 8 Jun 2022 11:18:58 +0200
Subject: [PATCH 2/2] ci: Work around git checkout security check

Alternative workaround for https://github.com/openshift/os/pull/814
---
 ci/validate.sh | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/ci/validate.sh b/ci/validate.sh
index d5e68ea6a..82dcd6621 100755
--- a/ci/validate.sh
+++ b/ci/validate.sh
@@ -1,5 +1,12 @@
 #!/bin/bash
 set -xeuo pipefail
+
+# Create a temporary copy
+workdir="$(mktemp -d)"
+echo "Using $workdir as working directory"
+cd "$workdir"
+git clone /go/src/github.com/openshift/os os
+cd os
 # First ensure submodules are initialized
 git submodule update --init --recursive
 # Basic syntax check