From b69e7d90bfaabcc7ef5afb5e13dcd883d91eefa2 Mon Sep 17 00:00:00 2001
From: Colin Walters <walters@verbum.org>
Date: Fri, 3 May 2024 14:49:39 -0400
Subject: [PATCH] user-experience: Resync with FCOS

I don't entirely remember what happened here when forking from
CoreOS, but we definitely want toolbox and lsof at least, just
looking at the differences.

While we're here I did readd sos, but in another section.

Signed-off-by: Colin Walters <walters@verbum.org>
---
 tier-1/coreos-user-experience.yaml | 42 ++++++++++++++++++++++++++++++
 tier-1/manifest.yaml               |  4 ++-
 tier-1/user-experience.yaml        | 33 -----------------------
 3 files changed, 45 insertions(+), 34 deletions(-)
 create mode 100644 tier-1/coreos-user-experience.yaml
 delete mode 100644 tier-1/user-experience.yaml

diff --git a/tier-1/coreos-user-experience.yaml b/tier-1/coreos-user-experience.yaml
new file mode 100644
index 0000000..0eb81fe
--- /dev/null
+++ b/tier-1/coreos-user-experience.yaml
@@ -0,0 +1,42 @@
+# This file was forked/copied from Fedora CoreOS.  TODO: resync
+# once we have a good generic mechanism for sharing.
+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 recommends but doesn't require criu and criu-libs. We want them for
+  ## checkpoint/restore. https://github.com/coreos/fedora-coreos-tracker/issues/1370
+  - crun criu criu-libs
+  - podman
+  - runc
+  - skopeo
+  - toolbox
+  # passt provides user-mode networking daemons for namespaces
+  - passt
+  # nvme-cli for managing nvme disks
+  - nvme-cli
+  # Used by admins interactively
+  - lsof
diff --git a/tier-1/manifest.yaml b/tier-1/manifest.yaml
index c8982a0..fd483bb 100644
--- a/tier-1/manifest.yaml
+++ b/tier-1/manifest.yaml
@@ -9,7 +9,7 @@ include:
   - firmware.yaml
   - networking-tools.yaml
   - system-configuration.yaml
-  - user-experience.yaml
+  - coreos-user-experience.yaml
   - fwupd.yaml
   - persistent-journal.yaml
   - initramfs-full.yaml
@@ -44,6 +44,8 @@ packages:
   - zram-generator
   # resolved was broken out to its own package in rawhide/f35
   - systemd-resolved
+  # This one is in Python so isn't in FCOS, but we can safely add it here.
+  - sos
 
 # These are random architecture-specific packages
 packages-x86_64:
diff --git a/tier-1/user-experience.yaml b/tier-1/user-experience.yaml
deleted file mode 100644
index 273b5d9..0000000
--- a/tier-1/user-experience.yaml
+++ /dev/null
@@ -1,33 +0,0 @@
-# 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.
-
-# 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
-  - less
-  - sudo
-  # Intended to be part of baseline RHEL-derived operating systems
-  - sos
-  # File compression/decompression
-  ## bsdtar - dependency of 35coreos-live dracut module
-  - bsdtar
-  - bzip2
-  - gzip
-  - tar
-  - xz
-  - zstd
-  # kdump support
-  # https://github.com/coreos/fedora-coreos-tracker/issues/622
-  - kexec-tools
-  # Remote Access
-  - openssh-clients openssh-server
-  # nvme-cli for managing nvme disks
-  - nvme-cli