From 84a724870afdc528595d8b0fc9a7fade3942079c Mon Sep 17 00:00:00 2001
From: Neil Hanlon <neil@rockylinux.org>
Date: Tue, 18 Oct 2022 14:12:45 -0400
Subject: [PATCH] hope and pray

---
 manifests/ignition-and-ostree.yaml |  2 +-
 manifests/rocky-ostree-base.yaml   |  3 +-
 manifests/shared-workarounds.yaml  |  2 +-
 manifests/user-experience.yaml     | 47 ++++++++++++++++++++++++++++++
 4 files changed, 51 insertions(+), 3 deletions(-)
 create mode 100644 manifests/user-experience.yaml

diff --git a/manifests/ignition-and-ostree.yaml b/manifests/ignition-and-ostree.yaml
index 8416a6d..2fba21f 100644
--- a/manifests/ignition-and-ostree.yaml
+++ b/manifests/ignition-and-ostree.yaml
@@ -13,7 +13,7 @@ boot-location: modules
 tmp-is-dir: true
 
 # Required by Ignition, and makes the system not compatible with Anaconda
-machineid-compat: false
+machineid-compat: true
 
 packages:
   - ignition
diff --git a/manifests/rocky-ostree-base.yaml b/manifests/rocky-ostree-base.yaml
index 6bbde24..445ff66 100644
--- a/manifests/rocky-ostree-base.yaml
+++ b/manifests/rocky-ostree-base.yaml
@@ -2,13 +2,14 @@ include:
   - ignition-and-ostree.yaml
   - shared-el9.yaml
   - shared-workarounds.yaml
+  - user-experience.yaml
 
 ostree-layers:
   - overlay/05core
   - overlay/08nouveau
   - overlay/09misc
-  - overlay/20platform-chrony
   - overlay/15fcos
+  - overlay/20platform-chrony
 
 
 conditional-include:
diff --git a/manifests/shared-workarounds.yaml b/manifests/shared-workarounds.yaml
index 4e256ae..42fd4e2 100644
--- a/manifests/shared-workarounds.yaml
+++ b/manifests/shared-workarounds.yaml
@@ -11,7 +11,7 @@ postprocess:
     set -xeuo pipefail
     source /etc/os-release
     # This has landed in Fedora but not in any version of RHEL yet
-    if [[ ${ID} != "rhel" ]]; then
+    if [[ ${ID} != "rocky" ]]; then
         exit 0
     fi
     mkdir /usr/lib/dracut/modules.d/36coreos-multipath-fix
diff --git a/manifests/user-experience.yaml b/manifests/user-experience.yaml
new file mode 100644
index 0000000..7e30fa7
--- /dev/null
+++ b/manifests/user-experience.yaml
@@ -0,0 +1,47 @@
+# This file is included in RHEL CoreOS, see
+# https://github.com/openshift/os/blob/71c974b1e456292033e3ef3fe7bcfe17d1855ebc/manifest.yaml#L12
+# Only apply changes here that should apply to both FCOS and RHCOS.
+
+# Default to `bash` in our container, the same as other containers we ship.
+container-cmd:
+  - /usr/bin/bash
+
+# These packages are either widely used utilities/services or
+# are targeted for improving the general CoreOS user experience.
+# It is intended to be kept generic so that it may be shared downstream with
+# RHCOS.
+packages:
+  # Basic user tools
+  ## jq - parsing/interacting with JSON data
+  - bash-completion
+  - coreutils
+  - file
+  - jq
+  - less
+  - sudo
+  - vim-minimal
+  # File compression/decompression
+  ## bsdtar - dependency of 35coreos-live dracut module
+  - bsdtar
+  - bzip2
+  - gzip
+  - tar
+  - xz
+  - zstd
+  # Improved MOTD experience
+  - console-login-helper-messages-issuegen
+  - console-login-helper-messages-profile
+  # kdump support
+  # https://github.com/coreos/fedora-coreos-tracker/issues/622
+  - kexec-tools
+  # Remote Access
+  - openssh-clients openssh-server
+  # Container tooling
+  - crun
+  - podman
+  - runc
+  - skopeo
+  - toolbox
+  # nvme-cli for managing nvme disks
+  - nvme-cli
+