Skip to content

Commit d511884

Browse files
committed
install: Add dracut subdirectory to baseimage reference
ref https://gitlab.com/fedora/bootc/tracker/-/issues/32#note_2270189835 This will keep track of the generic bootc+dracut integration glue here instead of replicating it in different base images. (Perhaps bootc actually injects code into the initramfs in the future instead of ostree, for example) Signed-off-by: Colin Walters <[email protected]>
1 parent 3f37f42 commit d511884

File tree

3 files changed

+12
-0
lines changed

3 files changed

+12
-0
lines changed

Makefile

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,9 @@ install:
2828
install -D -m 0644 -t $(DESTDIR)/$(prefix)/share/doc/bootc/baseimage/base/usr/lib/ostree/ baseimage/base/usr/lib/ostree/prepare-root.conf
2929
install -d -m 755 $(DESTDIR)/$(prefix)/share/doc/bootc/baseimage/base/sysroot
3030
cp -PfT baseimage/base/ostree $(DESTDIR)/$(prefix)/share/doc/bootc/baseimage/base/ostree
31+
# Ensure we've cleaned out any possibly older files
32+
rm -vrf $(DESTDIR)$(prefix)/share/doc/bootc/baseimage/dracut
33+
cp -Prf baseimage/dracut $(DESTDIR)$(prefix)/share/doc/bootc/baseimage/dracut
3134

3235
# Run this to also take over the functionality of `ostree container` for example.
3336
# Only needed for OS/distros that have callers invoking `ostree container` and not bootc.

baseimage/README.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,3 +8,5 @@ sources of content.
88
a hard requirement. It's not much, just an ostree configuration
99
enabling composefs, plus the default `sysroot` directory (which
1010
may go away in the future) and the `ostree` symlink into `sysroot`.
11+
- [dracut](dracut): Default/basic dracut configuration; at the current
12+
time this basically just enables ostree in the initramfs.
Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
# Typically we want want a generic image and
2+
# hostonly makes no sense as part of a server side build.
3+
# (really hostonly=no should be the default if dracut detects that
4+
# it's in a container or so)
5+
hostonly=no
6+
# We require ostree in the initramfs
7+
add_dracutmodules+=" ostree "

0 commit comments

Comments
 (0)