From: Roland Hieber <rhi@pengutronix.de>
To: ptxdist@pengutronix.de
Cc: Roland Hieber <rhi@pengutronix.de>
Subject: [ptxdist] [PATCH] systemd: add option to install systemd-repart
Date: Wed, 15 Mar 2023 21:01:31 +0100 [thread overview]
Message-ID: <20230315200130.2699501-1-rhi@pengutronix.de> (raw)
It runs on first boot via systemd-repart.service, so don't install it by
default.
Signed-off-by: Roland Hieber <rhi@pengutronix.de>
---
rules/systemd.in | 8 ++++++++
rules/systemd.make | 9 +++++++--
2 files changed, 15 insertions(+), 2 deletions(-)
diff --git a/rules/systemd.in b/rules/systemd.in
index 00d922a05c0a..3829bb925a96 100644
--- a/rules/systemd.in
+++ b/rules/systemd.in
@@ -19,6 +19,7 @@ menuconfig SYSTEMD
select LIBKMOD_TOOLS
select UTIL_LINUX
select UTIL_LINUX_LIBMOUNT
+ select UTIL_LINUX_LIBFDISK if SYSTEMD_REPART
select MACHINE_ID if RUNTIME
select XZ if SYSTEMD_XZ
select LZ4 if SYSTEMD_LZ4
@@ -170,6 +171,13 @@ config SYSTEMD_NSPAWN
bool
prompt "install systemd-nspawn"
+config SYSTEMD_REPART
+ bool
+ prompt "install systemd-repart"
+ help
+ systemd-repart repartitions the disk on first start according to
+ configuration files in /usr/lib/repart.d
+
config SYSTEMD_DEFAULT_NET_NAMING_SCHEME
string
prompt "default net.naming-scheme= value"
diff --git a/rules/systemd.make b/rules/systemd.make
index d42ab860624e..cd8c0bf9a70d 100644
--- a/rules/systemd.make
+++ b/rules/systemd.make
@@ -86,7 +86,7 @@ SYSTEMD_CONF_OPT := \
-Delfutils=$(call ptx/truefalse,PTXCONF_SYSTEMD_COREDUMP) \
-Denvironment-d=false \
-Dfallback-hostname=$(call ptx/ifdef,PTXCONF_ROOTFS_ETC_HOSTNAME,$(PTXCONF_ROOTFS_ETC_HOSTNAME),ptxdist) \
- -Dfdisk=false \
+ -Dfdisk=$(call ptx/truefalse,PTXCONF_SYSTEMD_REPART) \
-Dfexecve=false \
-Dfirstboot=false \
-Dfuzz-tests=false \
@@ -162,7 +162,7 @@ SYSTEMD_CONF_OPT := \
-Dquotaon-path=/usr/sbin/quotaon \
-Drandomseed=$(call ptx/falsetrue,PTXCONF_SYSTEMD_DISABLE_RANDOM_SEED) \
-Dremote=$(call ptx/ifdef,PTXCONF_SYSTEMD_JOURNAL_REMOTE,auto,false) \
- -Drepart=false \
+ -Drepart=$(call ptx/truefalse,PTXCONF_SYSTEMD_REPART) \
-Dresolve=$(call ptx/truefalse,PTXCONF_SYSTEMD_NETWORK) \
-Drfkill=false \
-Dseccomp=$(call ptx/truefalse,PTXCONF_SYSTEMD_SECCOMP) \
@@ -381,6 +381,11 @@ ifdef PTXCONF_SYSTEMD_NSPAWN
@$(call install_copy, systemd, 0, 0, 0755, -, /usr/bin/systemd-nspawn)
endif
+ifdef PTXCONF_SYSTEMD_REPART
+ @$(call install_copy, systemd, 0, 0, 0755, -, /usr/bin/systemd-repart)
+ @$(call install_alternative_tree, systemd, 0, 0, /usr/lib/repart.d/)
+endif
+
@$(call install_tree, systemd, 0, 0, -, /usr/lib/systemd/system-generators/)
@$(foreach helper, $(SYSTEMD_HELPER), \
$(call install_copy, systemd, 0, 0, 0755, -, \
--
2.30.2
next reply other threads:[~2023-03-15 20:02 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-03-15 20:01 Roland Hieber [this message]
2023-03-16 14:47 ` Michael Olbrich
2023-03-21 11:17 ` [ptxdist] [PATCH v2] " Roland Hieber
2023-03-24 9:03 ` [ptxdist] [APPLIED] " Michael Olbrich
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20230315200130.2699501-1-rhi@pengutronix.de \
--to=rhi@pengutronix.de \
--cc=ptxdist@pengutronix.de \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox