Merge pull request #1002 from cgwalters/baseimage-dracut-config

install: Add `dracut` subdirectory to baseimage reference

Author: cgwalters

Makefile

@@ -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.

baseimage/README.md

@@ -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.

baseimage/dracut/usr/lib/dracut.conf.d/10-bootc-base.conf

@@ -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 "