tier-0: Rename to minimal
The "tiers" nomenclature ended up being unhelpful since we introduced "tier-x" which is between tier-0 and tier-1. We also never exposed the tier naming outside of our source code. In preparation for doing so, rename to tier-0 to "minimal" which is a bit more descriptive. Renaming the other images will follow. Signed-off-by: Colin Walters <walters@verbum.org>
This commit is contained in:
parent
6f52311f70
commit
d1a21ed159
18 changed files with 11 additions and 12 deletions
29
minimal/basic-fixes.yaml
Normal file
29
minimal/basic-fixes.yaml
Normal file
|
|
@ -0,0 +1,29 @@
|
|||
# Fix general bugs
|
||||
|
||||
postprocess:
|
||||
# See also https://github.com/openshift/os/blob/f6cde963ee140c02364674db378b2bc4ac42675b/common.yaml#L156
|
||||
# This one is undoes the effect of
|
||||
# # RHEL-only: Disable /tmp on tmpfs.
|
||||
#Wants=tmp.mount
|
||||
# in /usr/lib/systemd/system/basic.target
|
||||
# We absolutely must have tmpfs-on-tmp for multiple reasons,
|
||||
# but the biggest is that when we have composefs for / it's read-only,
|
||||
# and for units with ProtectSystem=full systemd clones / but needs
|
||||
# a writable place.
|
||||
- |
|
||||
#!/usr/bin/env bash
|
||||
set -xeuo pipefail
|
||||
mkdir -p /usr/lib/systemd/system/local-fs.target.wants
|
||||
if test '!' -f /usr/lib/systemd/system/local-fs.target.wants/tmp.mount; then
|
||||
ln -sf ../tmp.mount /usr/lib/systemd/system/local-fs.target.wants
|
||||
fi
|
||||
|
||||
# See https://github.com/containers/bootc/issues/358
|
||||
# basically systemd-tmpfiles doesn't follow symlinks; ordinarily our
|
||||
# tmpfiles.d unit for `/var/roothome` is fine, but this actually doesn't
|
||||
# work if we want to use tmpfiles.d to write to `/root/.ssh` because
|
||||
# tmpfiles gives up on that before getting to `/var/roothome`.
|
||||
sed -i -e 's, /root, /var/roothome,' /usr/lib/tmpfiles.d/provision.conf
|
||||
# Because /var/roothome is also defined in rpm-ostree-0-integration.conf
|
||||
# we need to delete /var/roothome
|
||||
sed -i -e '/^d- \/var\/roothome /d' /usr/lib/tmpfiles.d/provision.conf
|
||||
Loading…
Add table
Add a link
Reference in a new issue