From d640123845bf2ec1a290721f2f417b588fc7399e Mon Sep 17 00:00:00 2001
From: Nicolas MASSE <nicolas.masse@itix.fr>
Date: Tue, 24 Nov 2020 20:25:08 +0100
Subject: [PATCH] image generation + correct remotes

---
 build.sh                                      |  3 ++
 image.yaml                                    | 28 ++++++++++++++++++-
 live                                          |  1 +
 manifest.yaml                                 |  7 +++++
 .../99itix/etc/ostree/remotes.d/itix.conf     |  3 ++
 5 files changed, 41 insertions(+), 1 deletion(-)
 mode change 120000 => 100644 image.yaml
 create mode 120000 live
 create mode 100644 overlay.d/99itix/etc/ostree/remotes.d/itix.conf

diff --git a/build.sh b/build.sh
index d10109f..d0069d5 100755
--- a/build.sh
+++ b/build.sh
@@ -66,6 +66,9 @@ fi
 export COREOS_ASSEMBLER_CONFIG_GIT="$git"
 cosa fetch
 cosa build
+cosa buildextend-metal
+cosa buildextend-metal4k # metal4k is needed to generate the livecd
+cosa buildextend-live
 
 message "Extracting generated ostree..."
 rm -rf "$build_repo" || exit 1
diff --git a/image.yaml b/image.yaml
deleted file mode 120000
index da1a3d0..0000000
--- a/image.yaml
+++ /dev/null
@@ -1 +0,0 @@
-fedora-coreos-config/image.yaml
\ No newline at end of file
diff --git a/image.yaml b/image.yaml
new file mode 100644
index 0000000..53c9229
--- /dev/null
+++ b/image.yaml
@@ -0,0 +1,27 @@
+# This replaces image.ks
+# size is the target disk size in GB.
+size: 8
+
+extra-kargs:
+    # Disable SMT on systems vulnerable to MDS or any similar future issue.
+    - mitigations=auto,nosmt
+    # https://github.com/coreos/fedora-coreos-tracker/issues/292
+    # https://fedoraproject.org/wiki/Changes/CGroupsV2
+    - systemd.unified_cgroup_hierarchy=0
+
+# Disable networking by default on firstboot. We can drop this once cosa stops
+# defaulting to `ip=dhcp,dhcp6 rd.neednet=1` when it doesn't see this key.
+ignition-network-kcmdline: []
+
+# Optional remote by which to prefix the deployed OSTree ref
+ostree-remote: itix
+
+# We want read-only /sysroot to protect from unintentional damage.
+# https://github.com/ostreedev/ostree/issues/1265
+sysroot-readonly: true
+
+# After this, we plan to add support for the Ignition
+# storage/filesystems sections.  (Although one can do
+# that on boot as well)
+
+
diff --git a/live b/live
new file mode 120000
index 0000000..c7e93e3
--- /dev/null
+++ b/live
@@ -0,0 +1 @@
+fedora-coreos-config/live
\ No newline at end of file
diff --git a/manifest.yaml b/manifest.yaml
index de5593f..3236c7d 100644
--- a/manifest.yaml
+++ b/manifest.yaml
@@ -6,3 +6,10 @@ packages:
 
 repos:
 - fedora
+
+postprocess:
+  # remove the "fedora" ostree remote
+  - |
+    #!/usr/bin/env bash
+    set -xeuo pipefail
+    rm /etc/ostree/remotes.d/fedora.conf
diff --git a/overlay.d/99itix/etc/ostree/remotes.d/itix.conf b/overlay.d/99itix/etc/ostree/remotes.d/itix.conf
new file mode 100644
index 0000000..d5864f6
--- /dev/null
+++ b/overlay.d/99itix/etc/ostree/remotes.d/itix.conf
@@ -0,0 +1,3 @@
+[remote "itix"]
+url=https://f003.backblazeb2.com/file/itix-ostree/
+gpg-verify=false
\ No newline at end of file