Commit Graph

62 Commits

Author SHA1 Message Date
Colin Walters 444acb374b Drop kernel-rt.yaml
It's unused right now and we are going to replace it with better
mechanisms.
2025-01-13 08:31:35 -05:00
Colin Walters 7369824a54 tier-0: Drop unused bootc-config.yaml
This file went empty a while ago when we moved the default
filesystem bits to the centos-stream image.
2025-01-03 16:11:15 -05:00
Colin Walters 279b050acb Create var/run -> ../run by default
Signed-off-by: Colin Walters <walters@verbum.org>
2024-12-13 09:17:41 -05:00
Colin Walters 7d5a0646a5 Update to 2024 edition
Prep for using finalize.d, but this is also just
a minor cleanup.
2024-12-13 09:17:41 -05:00
Xiaofeng Wang 128daa662c tier-0: remove gdisk and bootc has Rust create instead
bootc has a Rust create https://github.com/containers/bootc/pull/775
to replace gdisk which has been removed by c10s and RHEL-10

Signed-off-by: Xiaofeng Wang <xiaofwan@redhat.com>
2024-09-30 22:07:51 +08:00
Alexey Tikhonov b9593426a8 passwd: update home dir for 'sssd' service user
Starting sssd-2.10 that is shipped in F41+ and C10S,
home dir for 'sssd' service user is set to '/run/sssd'

Take a note that it's not the case yet for sssd-2.9-
that is currently shipped in C9S.
2024-09-27 17:48:07 +02:00
Jonathan Lebon 4511546f08
tier-0: pull in dnf using `/usr/bin/dnf` instead
dnf5 is currently in Fedora only, but this manifest is shared with
CentOS Stream and RHEL. Instead of requesting `dnf5`, request
`/usr/bin/dnf` instead. This will pull in dnf5 on Fedora, but dnf(4)
elsewhere.

We should be able to simplify this back to just `dnf` eventually once
dnf v4 is out of Fedora.
2024-09-23 10:45:38 -04:00
Jonathan Lebon 92172d2d56 Merge branch 'pr/coreutils' into 'main'
tier-0/x: various tweaks

See merge request fedora/bootc/base-images!54
2024-09-20 19:06:53 +00:00
Jonathan Lebon cbd531bc53
tier-0: fix sed invocation
Classic sed invocation footgun. Doing `-ie` actually binds the `e` to
`-i` which tells sed to backup the original with a suffix of `e`.

This gets rid of `/usr/lib/tmpfiles.d/provision.confe`.

systemd-tmpfiles ignores files that don't have `.conf` so the stray file
had no effect.
2024-09-20 12:56:50 -04:00
Jonathan Lebon 62be40d8b4
tier-0: drop `mkdir -p /run` workaround
This has long been unnecessary.

See also: 029d320bfe
2024-09-20 11:16:02 -04:00
Jonathan Lebon d6f00d618f
tier-0: explicitly list coreutils
This currently is already in tier-0, but it feels odd to not explicitly
list it. Noticed while comparing to FCOS manifests, which does list it.
2024-09-20 11:05:10 -04:00
Colin Walters (Red Hat) 39240d2848 Merge branch 'pr/iptables-nft' into 'main'
Drop iptables-legacy from tier-0, drop iptables-legacy alternatives hack from tier-1

See merge request fedora/bootc/base-images!46
2024-09-17 18:14:41 +00:00
Jonathan Lebon e89c5542ea
Move automatic updates by default from tier-0 to tier-1
tier-1 is more opinionated and automatic updates by default is
definitely a very strong opinion.

This makes it easier to inherit from tier-0 without having to undo that
knob if it's not desirable.

Prep for !48.
2024-09-17 13:56:47 -04:00
Jonathan Lebon de0ff17f75
tier-0: drop dbus-common remove-from-packages
This is no longer needed. The package has been fixed for a while.

See also: f7aaeb3d6c
2024-09-16 16:20:11 -04:00
Jonathan Lebon 55609b1d19
tier-0: pull in iptables-nft instead of iptables-legacy
As per the comment, currently we're pulling in iptables-legacy because
for some reason the `iptables` Provides is fulfilled by that instead of
iptables-nft. Explicitly name the latter to avoid this.

Note in tier-1 we do pull iptables-nft only because it's explicitly
named there.
2024-09-16 16:06:13 -04:00
Jonathan Lebon a85de9b2e0
tier-0: pull in dnf5, not dnf
Currently, there is both dnf and dnf5 in Fedora. dnf5 provides `dnf`,
but matching a package name is stronger and so requesting `dnf` here
still pulls in the legacy one.

This notably drops out Python from tier 0.
2024-09-15 23:05:14 -04:00
Joseph Marrero Corchado 17bb5e4128 Revert "tier-0: add systemd-cryptsetup to initrd dracut modules"
This reverts commit 7109132dd6.
2024-09-10 14:32:13 -04:00
Joseph Marrero e01020ddc2 tier-0: Add /usr/lib/{passwd,group} to dracut
On image mode systems we use nss-altfiles this,
change makes sure dracut uses them. This fix also
fixes kdump writing over NFS.
2024-09-06 22:56:57 -04:00
Colin Walters 0e9bf457eb Revert "bootc: Drop gdisk"
This reverts commit 5d8e7a5f6b.

Because I was confused, bootc does require it right now.
2024-09-03 08:48:51 -04:00
Colin Walters 5d8e7a5f6b bootc: Drop gdisk
See https://gitlab.com/redhat/centos-stream/containers/bootc/-/merge_requests/198
and https://issues.redhat.com/browse/RHELMISC-6651 etc.
2024-08-30 09:02:39 -04:00
Micah Abbott 7109132dd6 tier-0: add systemd-cryptsetup to initrd dracut modules
Fedora 41 appears to require the inclusion of `systemd-cryptsetup` in
the initrd in order to unlock LUKS devices at boot.

See: #17

Signed-off-by: Micah Abbott <miabbott@redhat.com>
2024-08-29 09:23:25 -04:00
Colin Walters 0da319f566 initramfs: Switch to `add_dracutmodules`
Per discussion in https://github.com/rhkdump/kdump-utils/pull/29#issuecomment-2303932537

This would have avoided kdump breakage, and the original motivation
of avoiding dracut error spam from missing things is gone now
that Fedora is using dracut-ng which has
d73cc24e11
2024-08-22 09:38:07 -04:00
Colin Walters fb882c9002 manifest: Unconditionally include bootupd
It's supported on all architectures now, even if it's
a no-op mostly on s390x today.

But specifically this will ensure we pull in zipl on s390x,
which *is* needed.

Signed-off-by: Colin Walters <walters@verbum.org>
2024-05-29 13:50:59 -04:00
Paul Whalen b0fa1f1dcd tier-0: add dnf for building derived images
Signed-off-by: Paul Whalen <pwhalen@fedoraproject.org>
2024-05-08 08:14:30 -04:00
Colin Walters cfafc9e78a Only set default filesystem to XFS in CentOS
Fedora default filesystem is a messier situation.  This makes
it easier to inherit Fedora builds.

Signed-off-by: Colin Walters <walters@verbum.org>
2024-04-18 17:20:36 -04:00
Colin Walters 2d4c35279a Switch to systemd by default
Closes: https://github.com/CentOS/centos-bootc/issues/449
2024-03-26 12:27:29 -04:00
Colin Walters 9b676228ee Add opt-usrlocal: root
We want content lifecycled with the image.

Signed-off-by: Colin Walters <walters@verbum.org>
2024-03-19 09:00:15 -04:00
Michael Vogt 8ee104d7bc basic-fixes: Tweak tmpfiles.d/provision.conf
As a followup for https://github.com/CentOS/centos-bootc/pull/371
this PR tweaks `tmpfiles.d/provision.conf` so
that there is only a single /var/roothome line for tmpfiles.d

As it is both provision.conf and rpm-ostree-0-integration.conf
define the same dir.

This should fix https://github.com/containers/bootc/issues/358
2024-03-18 12:52:21 +01:00
Colin Walters 86bc5473d3 ostree: Switch to composefs enabled = yes
This is the opposite workaround for
https://github.com/ostreedev/ostree-rs-ext/issues/612

However, we still need to finally make `/opt` a directory
to complete this, which currently wants changes in rpm-ostree.
(Or, we could tweak our build process to inject as a container
 afterwards)
2024-03-13 12:37:01 -04:00
Colin Walters 2257dd6cb5 Enable composefs root
This partially reverts commit 7977ead6e4 and
effectively migrates the change from 8f5be09371
and 14ab1c5847
to here.

Signed-off-by: Colin Walters <walters@verbum.org>
2024-03-01 13:52:11 -05:00
Colin Walters 1688a6f9cb basic-fixes: Tweak `/usr/lib/tmpfiles.d/provision.conf`
This ensures that systemd's creation of `/root` works instead
of falling back to what we have in
`/usr/lib/tmpfiles.d/rpm-ostree-0-integration.conf` for
`d /var/roothome 0700 root root -` which in turn ensures
that both the credential values as well as bootc's injection
of a tmpfiles.d snippet for root SSH key works.

https://github.com/containers/bootc/issues/358
Signed-off-by: Colin Walters <walters@verbum.org>
2024-02-28 08:23:06 -05:00
Colin Walters fb8efab43f tier-0: Enable tmp.mount by default
The long-carried-forward patch to disable `tmp.mount` for RHEL
rears its head again.
2024-02-12 15:06:34 -05:00
Colin Walters d933e13974 manifests/bootupd: Drop unnecessary /
It's not supported to pass anything other than `/` now, and
the argument has been optional for some time.
2024-02-07 08:33:21 -05:00
Colin Walters 93588bf969
Merge pull request #232 from cgwalters/machined-compat-true
Start with an empty `/etc/machine-id` to disable `ConditionFirstBoot`
2024-02-03 08:01:21 -05:00
Colin Walters 256852e764 Start with an empty `/etc/machine-id` to disable `ConditionFirstBoot`
The systemd firstboot process does several things, but notably
it runs a preset process.  This means that basically a plain
`RUN systemctl enable foo` won't work unless you *also* write
a preset file for it, and no one will know to do that.
2024-01-30 13:09:43 -05:00
Colin Walters 776e92256b initramfs: Add virtiofs
Today it's built as a module for Fedora derivatives, but
it's a relatively small kmod.

In particular I want to be able to use a virtiofs root as
a bootstrap mechanism to generate disk images in a situation
where we can't do nested containers, but we do have `/dev/kvm` -
which is the setup we have in e.g. OpenShift Prow on `build02`
with nested virt.
2024-01-27 10:57:47 -05:00
Colin Walters 2e56406003 autoupdates: Minor comment cleanup
Real motivation is to retrigger a build.
2024-01-23 12:55:27 -05:00
Colin Walters 7977ead6e4 tier-0: back off transient root
Until https://github.com/osbuild/bootc-image-builder/issues/149 is
fixed.
2024-01-23 08:11:35 -05:00
Colin Walters e456c289b5 autoupdates: Fix to use correct unit
Definitely a brown paper bag bug.
2024-01-19 17:43:05 -05:00
Colin Walters 67462b0dbc Enable `bootc-fetch-apply-updates.service` by default
This landed in c13c9eb8dc
And we want to come out emphasizing it.

Signed-off-by: Colin Walters <walters@verbum.org>
2024-01-18 18:21:44 -05:00
Colin Walters 7326c3686a tier-0: bootc is now in c9s
So drop the conditional.
2024-01-15 09:33:53 -05:00
Daniel J Walsh 528fb2329e
Merge pull request #98 from cgwalters/enable-transient-root
ostree: Enable root.transient = true by default
2023-12-22 08:02:50 -05:00
Colin Walters b65d2c5bdc
Merge pull request #105 from cgwalters/fix-bootc-to-eln
tier-0: bootc is only in eln
2023-12-13 13:53:30 -05:00
Colin Walters 6c9d3b8b62 tier-0: bootc is only in eln
Prep for building with non-stream9 distros.

(TODO: add a dedicated variable for this at the toplevel)
2023-12-12 15:38:10 -05:00
Colin Walters b943729fb2 initramfs: Also enable ostree module
rpm-ostree does this, but let's do it here too for
extra reliability.
2023-12-12 12:33:37 -05:00
Colin Walters ecbd78af68 initramfs: Consolidate and rename drop-initramfs
No reason to have the "base" settings in distinct files.
2023-12-12 11:32:49 -05:00
Colin Walters 48c85849e6 initramfs: Move our dracut config later
Our hostonly setting was conflicting with the default
`hostonly=yes` in `01-dist.conf`.
2023-12-12 11:31:05 -05:00
Colin Walters dd0a042a17 Always add bootc install config
bootc isn't in C9S yet, but it is in the -dev images.  Add
the install config unconditionally so that `bootc install`
works in the `centos-bootc-dev` image.
2023-12-08 12:45:42 -05:00
Colin Walters e6761c23bc ostree: Enable root.transient = true by default
This turns on the functionality added in
https://github.com/ostreedev/ostree/pull/3114
2023-12-08 08:08:05 -05:00
German Maglione 9cd73eb159 Fix cat redirection
Just a small fix, adding a missing redirection so that
'01-bootc-nohostonly.conf' is not created empty.
Since dracut's default is 'hostonly=no' this fix has
no impact on the initramfs contents.

Signed-off-by: German Maglione <gmaglione@redhat.com>
2023-11-29 14:18:13 +01:00