Skip to content

Commit

Permalink
baseimage: Add systemd configuration files
Browse files Browse the repository at this point in the history
Added a kernel-install configuration that enables
the rpm-ostree integration.

The second configuration file sets the Journal to persistent
as on bootc systems /var is empty by default and systemd
by default enables persistent journaling on the presence of
/var/log/journal.

Signed-off-by: Joseph Marrero <[email protected]>
  • Loading branch information
jmarrero committed Jan 10, 2025
1 parent adf18ea commit 43053f9
Show file tree
Hide file tree
Showing 3 changed files with 10 additions and 0 deletions.
3 changes: 3 additions & 0 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,10 @@ install:
cp -PfT baseimage/base/ostree $(DESTDIR)/$(prefix)/share/doc/bootc/baseimage/base/ostree
# Ensure we've cleaned out any possibly older files
rm -vrf $(DESTDIR)$(prefix)/share/doc/bootc/baseimage/dracut
rm -vrf $(DESTDIR)$(prefix)/share/doc/bootc/baseimage/systemd
# Copy dracut and systemd config files
cp -Prf baseimage/dracut $(DESTDIR)$(prefix)/share/doc/bootc/baseimage/dracut
cp -Prf baseimage/systemd $(DESTDIR)$(prefix)/share/doc/bootc/baseimage/systemd

# Run this to also take over the functionality of `ostree container` for example.
# Only needed for OS/distros that have callers invoking `ostree container` and not bootc.
Expand Down
2 changes: 2 additions & 0 deletions baseimage/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -10,3 +10,5 @@ sources of content.
may go away in the future) and the `ostree` symlink into `sysroot`.
- [dracut](dracut): Default/basic dracut configuration; at the current
time this basically just enables ostree in the initramfs.
- [systemd](systemd): Optional configuration for systemd, currently
this has configuration for kernel-install enabling rpm-ostree integration.
5 changes: 5 additions & 0 deletions baseimage/systemd/usr/lib/kernel/install.conf
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
# kernel-install will not try to run dracut and allow rpm-ostree to
# take over. Rpm-ostree will use this to know that it is responsible
# to run dracut and ensure that there is only one kernel in the image
layout=ostree

0 comments on commit 43053f9

Please sign in to comment.