Skip to content

Commit

Permalink
Merge pull request #1002 from cgwalters/baseimage-dracut-config
Browse files Browse the repository at this point in the history
install: Add `dracut` subdirectory to baseimage reference
  • Loading branch information
cgwalters authored Jan 3, 2025
2 parents 3f37f42 + d511884 commit 6a2b7e0
Show file tree
Hide file tree
Showing 3 changed files with 12 additions and 0 deletions.
3 changes: 3 additions & 0 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,9 @@ install:
install -D -m 0644 -t $(DESTDIR)/$(prefix)/share/doc/bootc/baseimage/base/usr/lib/ostree/ baseimage/base/usr/lib/ostree/prepare-root.conf
install -d -m 755 $(DESTDIR)/$(prefix)/share/doc/bootc/baseimage/base/sysroot
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
cp -Prf baseimage/dracut $(DESTDIR)$(prefix)/share/doc/bootc/baseimage/dracut

# 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 @@ -8,3 +8,5 @@ sources of content.
a hard requirement. It's not much, just an ostree configuration
enabling composefs, plus the default `sysroot` directory (which
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.
7 changes: 7 additions & 0 deletions baseimage/dracut/usr/lib/dracut.conf.d/10-bootc-base.conf
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
# Typically we want want a generic image and
# hostonly makes no sense as part of a server side build.
# (really hostonly=no should be the default if dracut detects that
# it's in a container or so)
hostonly=no
# We require ostree in the initramfs
add_dracutmodules+=" ostree "

0 comments on commit 6a2b7e0

Please sign in to comment.