From 6f13a8f474fc70779b945f40a70f1973dacd9a80 Mon Sep 17 00:00:00 2001 From: Harald Sitter Date: Sat, 20 Jul 2024 20:25:24 +0200 Subject: [PATCH] make sure btrfs is in the initrd --- mkosi.extra/usr/bin/_kdeos-overlay | 2 ++ mkosi.extra/usr/lib/initcpio/install/systemd-extension | 3 ++- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/mkosi.extra/usr/bin/_kdeos-overlay b/mkosi.extra/usr/bin/_kdeos-overlay index 5970790..e810857 100755 --- a/mkosi.extra/usr/bin/_kdeos-overlay +++ b/mkosi.extra/usr/bin/_kdeos-overlay @@ -27,6 +27,8 @@ mount -v \ # Make sure our subvolumes exist! In particular if we introduce subvolumes after installation. # FIXME This is a bit garbage. It'd be much tidier if we could tell repart to do this for us. But in some sort of # safe mode so it doesn't twiddle the partition table. +# FIXME does this even work? do we have btrfs util in the initrd? + [ -d "${sysroot}/system/@root" ] || btrfs subvolume create "${sysroot}/system/@root" mount -v \ diff --git a/mkosi.extra/usr/lib/initcpio/install/systemd-extension b/mkosi.extra/usr/lib/initcpio/install/systemd-extension index 814bf33..ec6b7a8 100644 --- a/mkosi.extra/usr/lib/initcpio/install/systemd-extension +++ b/mkosi.extra/usr/lib/initcpio/install/systemd-extension @@ -7,7 +7,8 @@ build() { /usr/lib/systemd/systemd-volatile-root \ /usr/bin/_kdeos-overlay \ /usr/lib/systemd/system-generators/kdeos-live-generator \ - /usr/lib/systemd/systemd-bootchart + /usr/lib/systemd/systemd-bootchart \ + /usr/bin/btrfs map add_systemd_unit \ systemd-volatile-root.service \