mirror of
https://github.com/coreos/fedora-coreos-config.git
synced 2026-02-06 21:46:02 +01:00
manifests: drop all keys that no longer have meaning
In a derived container build world, which we've switched to in F43+ [1], there are a lot of historical RPM-OSTree manifest keys that are essentially dead configuration (has no effect). If anything isn't explicitly handled in `build-rootfs` like `recommends:` and `ostree-layers:` then it's either not important or being handled a different way (like in a postprocess). [1] https://github.com/coreos/fedora-coreos-tracker/issues/1969
This commit is contained in:
@@ -1,22 +1,5 @@
|
||||
# Here we override some key settings from bootc minimal-plus.
|
||||
|
||||
# Required by Ignition, and makes the system not compatible with Anaconda.
|
||||
# Note this deviates from fedora-bootc and means `systemctl enable` doesn't
|
||||
# work in a container build. We'll have to resolve that issue some other way in
|
||||
# the future... For more details, see
|
||||
# https://github.com/CentOS/centos-bootc/issues/167
|
||||
# https://coreos.github.io/rpm-ostree/treefile/#experimental-options
|
||||
# This is re-implemented below for the container-native flow. Nuke this once
|
||||
# that's the only path we support.
|
||||
machineid-compat: false
|
||||
|
||||
# This is the historical default and what FCOS currently ships. fedora-bootc
|
||||
# uses the new `root` value, but migrating FCOS is not that simple...
|
||||
# https://coreos.github.io/rpm-ostree/treefile/#experimental-options
|
||||
# This is re-implemented below for the container-native flow. Nuke this once
|
||||
# that's the only path we support.
|
||||
opt-usrlocal: var
|
||||
|
||||
postprocess:
|
||||
# Make `/opt and `/usr/local` symlinks.
|
||||
# This is the historical default and what FCOS currently ships. fedora-bootc
|
||||
|
||||
@@ -61,26 +61,6 @@ conditional-include:
|
||||
# Be minimal
|
||||
recommends: false
|
||||
|
||||
ignore-removed-users:
|
||||
- root
|
||||
ignore-removed-groups:
|
||||
- root
|
||||
# Add the sudo group to /etc/group
|
||||
# This is re-implemented below for the container-native flow. Nuke this once
|
||||
# that's the only path we support.
|
||||
etc-group-members:
|
||||
- sudo
|
||||
|
||||
check-passwd:
|
||||
type: "file"
|
||||
filename: "passwd"
|
||||
check-groups:
|
||||
type: "file"
|
||||
filename: "group"
|
||||
|
||||
# we can drop this when it's the rpm-ostree default
|
||||
rpmdb: sqlite
|
||||
|
||||
# ⚠⚠⚠ ONLY TEMPORARY HACKS ALLOWED HERE; ALL ENTRIES NEED TRACKER LINKS ⚠⚠⚠
|
||||
# See also the version of this in fedora-coreos.yaml
|
||||
postprocess:
|
||||
@@ -118,7 +98,6 @@ postprocess:
|
||||
ln -sf multi-user.target /usr/lib/systemd/system/default.target
|
||||
|
||||
# Add the sudo group to /etc/group in container-native flow.
|
||||
# We can nuke `etc-group-members` once this is the only supported path.
|
||||
- |
|
||||
#!/usr/bin/env bash
|
||||
set -xeuo pipefail
|
||||
|
||||
@@ -2,15 +2,6 @@
|
||||
# into "official" builds of Fedora CoreOS (such as including `fedora-release-coreos`)
|
||||
# or are very "opinionated" like disabling SSH passwords by default.
|
||||
|
||||
ref: fedora/${basearch}/coreos/${stream}
|
||||
metadata:
|
||||
license: MIT
|
||||
name: fedora-coreos
|
||||
summary: Fedora CoreOS ${stream}
|
||||
|
||||
add-commit-metadata:
|
||||
fedora-coreos.stream: ${stream}
|
||||
|
||||
include: fedora-coreos-base.yaml
|
||||
conditional-include:
|
||||
- if: releasever >= 41
|
||||
@@ -61,7 +52,6 @@ ostree-layers:
|
||||
- overlay/15fcos
|
||||
- overlay/17fcos-container-signing
|
||||
|
||||
automatic-version-prefix: "${releasever}.<date:%Y%m%d>.dev"
|
||||
mutate-os-release: "${releasever}"
|
||||
|
||||
packages:
|
||||
@@ -79,15 +69,6 @@ packages:
|
||||
# https://github.com/coreos/fedora-coreos-tracker/issues/1567
|
||||
- bash-color-prompt
|
||||
|
||||
# Add the docker group to /etc/group
|
||||
# https://github.com/coreos/fedora-coreos-tracker/issues/2
|
||||
# This will be no longer needed when systemd-sysusers has been implemented:
|
||||
# https://github.com/projectatomic/rpm-ostree/issues/49
|
||||
# This is re-implemented below for the container-native flow. Nuke this once
|
||||
# that's the only path we support.
|
||||
etc-group-members:
|
||||
- docker
|
||||
|
||||
# ⚠⚠⚠ ONLY TEMPORARY HACKS ALLOWED HERE; ALL ENTRIES NEED TRACKER LINKS ⚠⚠⚠
|
||||
# See also the version of this in fedora-coreos-base.yaml
|
||||
postprocess:
|
||||
@@ -185,7 +166,6 @@ postprocess:
|
||||
# https://github.com/coreos/fedora-coreos-tracker/issues/2
|
||||
# This will be no longer needed when systemd-sysusers has been implemented:
|
||||
# https://github.com/projectatomic/rpm-ostree/issues/49
|
||||
# We can nuke `etc-group-members` once this is the only path we support.
|
||||
- |
|
||||
#!/usr/bin/env bash
|
||||
set -xeuo pipefail
|
||||
|
||||
Reference in New Issue
Block a user