From 4c185a42fdad1b48f61286edf65421818d43fd79 Mon Sep 17 00:00:00 2001 From: "Yann E. MORIN" Date: Sun, 15 Jan 2023 13:52:46 +0100 Subject: [PATCH] system: introduce a choice for /var management MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Currently, we have a single solution to handle the /var content on a read-only root filesystem, and users can opt out of using it. We're going to introduce another solution (based on an overlayfs), which is incompatible with using the factory, so we'll have a choice of three mutually exclusive options. Introduce that choice now with just the existing /var factory, and a new option to opt out of it. Signed-off-by: Yann E. MORIN Signed-off-by: Yann E. MORIN Cc: Norbert Lange Cc: Arnout Vandecappelle (Essensium/Mind) Cc: Romain Naour Cc : Jérémy Rosen Acked-by: Norbert Lange Signed-off-by: Arnout Vandecappelle --- system/Config.in | 22 +++++++++++++++++++--- 1 file changed, 19 insertions(+), 3 deletions(-) diff --git a/system/Config.in b/system/Config.in index 24798dc068..c017d3797a 100644 --- a/system/Config.in +++ b/system/Config.in @@ -159,10 +159,16 @@ endchoice if BR2_INIT_SYSTEMD -config BR2_INIT_SYSTEMD_VAR_FACTORY - bool "build a factory to populate a tmpfs on /var" - default y # legacy +choice + bool "/var management" + default BR2_INIT_SYSTEMD_VAR_FACTORY # legacy depends on !BR2_TARGET_GENERIC_REMOUNT_ROOTFS_RW + help + Select how Buildroot provides a read-write /var when the + rootfs is not remounted read-write. + +config BR2_INIT_SYSTEMD_VAR_FACTORY + bool "build a factory to populate a tmpfs" help Build a factory of the content of /var as installed by packages, mount a tmpfs on /var at runtime, so that @@ -184,6 +190,16 @@ config BR2_INIT_SYSTEMD_VAR_FACTORY var.mount unit, that overrides the What and Type, and possibly the Options and After, fields. +config BR2_INIT_SYSTEMD_VAR_NONE + bool "do nothing" + help + Choose this if you have custom dispositions (like one or more + of a post-build script, a fakeroot script, systemd units, an + initramfs, or something else) that prepare /var to be writable + on a read-only rootfs. + +endchoice + config BR2_INIT_SYSTEMD_POPULATE_TMPFILES bool "trigger systemd-tmpfiles during build" default y # legacy