From 7fc5fa11d555b069fa0ac29f4049c7da15feaa2b Mon Sep 17 00:00:00 2001 From: Harald Sitter Date: Sun, 17 Mar 2024 23:43:50 +0100 Subject: [PATCH] overlay: add support for locale directory inconveniently locales are in /usr/lib/locale rather than var. selectively overlay it with a subvolume --- mkosi.extra/usr/bin/_calamares@subvol | 1 + mkosi.extra/usr/bin/_kdeos-overlay | 3 +++ mkosi.repart/50-root.conf | 3 +++ 3 files changed, 7 insertions(+) diff --git a/mkosi.extra/usr/bin/_calamares@subvol b/mkosi.extra/usr/bin/_calamares@subvol index 307089e..9069f1c 100755 --- a/mkosi.extra/usr/bin/_calamares@subvol +++ b/mkosi.extra/usr/bin/_calamares@subvol @@ -28,6 +28,7 @@ cd "$tmpdir" rm -rfv ./* btrfs send "/system/@kdeos_$IMAGE_VERSION" | btrfs receive . btrfs subvolume create @home +btrfs subvolume create @locale btrfs subvolume create @snap btrfs subvolume create @var-overlay btrfs subvolume create @etc-overlay diff --git a/mkosi.extra/usr/bin/_kdeos-overlay b/mkosi.extra/usr/bin/_kdeos-overlay index 26ca67c..b4dd9d6 100755 --- a/mkosi.extra/usr/bin/_kdeos-overlay +++ b/mkosi.extra/usr/bin/_kdeos-overlay @@ -27,6 +27,9 @@ mount -v \ mount -v \ -o rw,subvol=@home \ "$rootdisk" "${sysroot}/home" +mount -v \ + -o rw,subvol=@locale \ + "$rootdisk" "${sysroot}/usr/lib/locale" mount -v \ -o rw,subvol=@snap \ "$rootdisk" "${sysroot}/snap" diff --git a/mkosi.repart/50-root.conf b/mkosi.repart/50-root.conf index 9037751..79de5dd 100644 --- a/mkosi.repart/50-root.conf +++ b/mkosi.repart/50-root.conf @@ -13,6 +13,9 @@ SplitName=root Subvolumes=/@home MakeDirectories=/@home +Subvolumes=/@locale +MakeDirectories=/@locale + Subvolumes=/@snap MakeDirectories=/@snap