From: Roland Hieber <rhi@pengutronix.de>
To: ptxdist@pengutronix.de
Cc: Roland Hieber <rhi@pengutronix.de>
Subject: [ptxdist] [PATCH 7/7] systemd: make hostnamed and quotacheck optional
Date: Mon, 7 Jun 2021 15:09:09 +0200 [thread overview]
Message-ID: <20210607130909.4836-7-rhi@pengutronix.de> (raw)
In-Reply-To: <20210607130909.4836-1-rhi@pengutronix.de>
This reduces the dependency graph and can therefore decrease boot time
on systems that are configured with a static hostname, and which do not
use quota. With this, /usr/share/dbus-1/system-services/ may no longer
contain any service definitions, so add an empty kconfig option for it.
Signed-off-by: Roland Hieber <rhi@pengutronix.de>
---
rules/systemd.in | 21 +++++++++++++++++++++
rules/systemd.make | 12 ++++++++----
2 files changed, 29 insertions(+), 4 deletions(-)
diff --git a/rules/systemd.in b/rules/systemd.in
index 854c344d5441..0f7ba889686e 100644
--- a/rules/systemd.in
+++ b/rules/systemd.in
@@ -56,11 +56,23 @@ comment "D-Bus is needed for the enabled features"
config SYSTEMD_DBUS
bool
+config SYSTEMD_DBUS_SERVICES
+ bool
+
+config SYSTEMD_HOSTNAMED
+ bool
+ select SYSTEMD_DBUS_SERVICES
+ prompt "hostname daemon support"
+ help
+ A tiny daemon that can be used to control the host name and related
+ machine meta data from user programs.
+
config SYSTEMD_MICROHTTPD
bool
config SYSTEMD_LOCALES
bool
+ select SYSTEMD_DBUS_SERVICES
default LOCALES
config SYSTEMD_VCONSOLE
@@ -80,6 +92,7 @@ config SYSTEMD_DISABLE_RANDOM_SEED
config SYSTEMD_LOGIND
bool
select SYSTEMD_DBUS
+ select SYSTEMD_DBUS_SERVICES
prompt "login daemon"
config SYSTEMD_UNITS_USER
@@ -89,6 +102,7 @@ config SYSTEMD_UNITS_USER
config SYSTEMD_NETWORK
bool
+ select SYSTEMD_DBUS_SERVICES
prompt "network configuration with systemd"
config SYSTEMD_IPMASQUERADE
@@ -102,6 +116,7 @@ config SYSTEMD_TIMEDATE
bool
default y
select SYSTEMD_DBUS
+ select SYSTEMD_DBUS_SERVICES
prompt "date/time handling"
help
NTP client for time synchronization and local timezone handling.
@@ -122,6 +137,12 @@ config SYSTEMD_POLKIT
bool
default POLKIT
+config SYSTEMD_QUOTACHECK
+ bool
+ prompt "disk quota support"
+ help
+ File system quota checker logic.
+
menu "journald "
config SYSTEMD_XZ
diff --git a/rules/systemd.make b/rules/systemd.make
index 8e80b8bcb244..e275322fd426 100644
--- a/rules/systemd.make
+++ b/rules/systemd.make
@@ -95,7 +95,7 @@ SYSTEMD_CONF_OPT := \
-Dgshadow=false \
-Dhibernate=false \
-Dhomed=false \
- -Dhostnamed=true \
+ -Dhostnamed=$(call ptx/truefalse,PTXCONF_SYSTEMD_HOSTNAMED) \
-Dhtml=false \
-Dhwdb=$(call ptx/truefalse,PTXCONF_SYSTEMD_UDEV_HWDB) \
-Didn=false \
@@ -151,7 +151,7 @@ SYSTEMD_CONF_OPT := \
-Dpstore=false \
-Dpwquality=false \
-Dqrencode=false \
- -Dquotacheck=true \
+ -Dquotacheck=$(call ptx/truefalse,PTXCONF_SYSTEMD_QUOTACHECK) \
-Dquotacheck-path=/usr/sbin/quotacheck \
-Dquotaon-path=/usr/sbin/quotaon \
-Drandomseed=$(call ptx/falsetrue,PTXCONF_SYSTEMD_DISABLE_RANDOM_SEED) \
@@ -245,7 +245,7 @@ SYSTEMD_HELPER := \
$(call ptx/ifdef, PTXCONF_SYSTEMD_COREDUMP,systemd-coredump) \
systemd-fsck \
systemd-growfs \
- systemd-hostnamed \
+ $(call ptx/ifdef, PTXCONF_SYSTEMD_HOSTNAMED,systemd-hostnamed) \
systemd-journald \
$(call ptx/ifdef, PTXCONF_SYSTEMD_JOURNAL_REMOTE,systemd-journal-remote) \
$(call ptx/ifdef, PTXCONF_SYSTEMD_LOCALES,systemd-localed) \
@@ -254,7 +254,7 @@ SYSTEMD_HELPER := \
systemd-modules-load \
$(call ptx/ifdef, PTXCONF_SYSTEMD_NETWORK,systemd-networkd) \
$(call ptx/ifdef, PTXCONF_SYSTEMD_NETWORK,systemd-networkd-wait-online) \
- systemd-quotacheck \
+ $(call ptx/ifdef, PTXCONF_SYSTEMD_QUOTACHECK,systemd-quotacheck) \
$(call ptx/ifdef, PTXCONF_SYSTEMD_DISABLE_RANDOM_SEED,,systemd-random-seed) \
systemd-remount-fs \
systemd-reply-password \
@@ -342,7 +342,9 @@ $(STATEDIR)/systemd.targetinstall:
@$(call install_copy, systemd, 0, 0, 0755, -, /usr/bin/systemd-notify)
@$(call install_copy, systemd, 0, 0, 0755, -, /usr/bin/systemd-tmpfiles)
@$(call install_copy, systemd, 0, 0, 0755, -, /usr/bin/busctl)
+ifdef PTXCONF_SYSTEMD_HOSTNAMED
@$(call install_copy, systemd, 0, 0, 0755, -, /usr/bin/hostnamectl)
+endif
@$(call install_copy, systemd, 0, 0, 0755, -, /usr/bin/systemd-analyze)
@$(call install_copy, systemd, 0, 0, 0755, -, /usr/bin/systemd-cat)
@$(call install_copy, systemd, 0, 0, 0755, -, /usr/bin/systemd-cgls)
@@ -372,9 +374,11 @@ $(STATEDIR)/systemd.targetinstall:
@$(call install_tree, systemd, 0, 0, -, /usr/lib/tmpfiles.d/)
@$(call install_copy, systemd, 0, 0, 0644, -, /usr/lib/sysctl.d/50-default.conf)
+ifdef PTXCONF_SYSTEMD_DBUS_SERVICES
@$(call install_copy, systemd, 0, 0, 0644, -, \
/usr/share/dbus-1/services/org.freedesktop.systemd1.service)
@$(call install_tree, systemd, 0, 0, -, /usr/share/dbus-1/system-services/)
+endif
# # systemd expects this directory to exist.
@$(call install_copy, systemd, 0, 0, 0755, /var/lib/systemd)
--
2.29.2
_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de
To unsubscribe, send a mail with subject "unsubscribe" to ptxdist-request@pengutronix.de
next prev parent reply other threads:[~2021-06-07 13:10 UTC|newest]
Thread overview: 21+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-06-07 13:09 [ptxdist] [PATCH 1/7] googletest: new package Roland Hieber
2021-06-07 13:09 ` [ptxdist] [PATCH 2/7] python3-pyro: " Roland Hieber
2021-06-16 10:35 ` [ptxdist] [APPLIED] " Michael Olbrich
2021-06-07 13:09 ` [ptxdist] [PATCH 3/7] host-extract-cert: version bump 0.1 -> 0.2 Roland Hieber
2021-06-16 10:35 ` [ptxdist] [APPLIED] " Michael Olbrich
2021-06-07 13:09 ` [ptxdist] [PATCH 4/7] ima-evm-utils: fix license statement Roland Hieber
2021-06-11 12:24 ` Michael Olbrich
2021-06-07 13:09 ` [ptxdist] [PATCH 5/7] ima-evm-utils: version bump 1.1 -> 1.2.1 Roland Hieber
2021-06-11 12:18 ` Michael Olbrich
2021-06-16 16:01 ` Roland Hieber
2021-06-17 6:44 ` Michael Olbrich
2021-06-17 6:47 ` Michael Olbrich
2021-06-17 7:08 ` Michael Olbrich
2021-06-17 13:01 ` Roland Hieber
2021-06-07 13:09 ` [ptxdist] [PATCH 6/7] rng-tools: allow installing rngtest without rngd Roland Hieber
2021-06-16 10:35 ` [ptxdist] [APPLIED] " Michael Olbrich
2021-06-07 13:09 ` Roland Hieber [this message]
2021-06-11 8:04 ` [ptxdist] [PATCH 7/7] systemd: make hostnamed and quotacheck optional Michael Olbrich
2021-06-16 16:14 ` Roland Hieber
2021-06-17 6:45 ` Michael Olbrich
2021-06-16 10:35 ` [ptxdist] [APPLIED] googletest: new package 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=20210607130909.4836-7-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