From mboxrd@z Thu Jan 1 00:00:00 1970 Delivery-date: Tue, 29 Jun 2021 07:10:32 +0200 Received: from metis.ext.pengutronix.de ([2001:67c:670:201:290:27ff:fe1d:cc33]) by lore.white.stw.pengutronix.de with esmtp (Exim 4.92) (envelope-from ) id 1ly612-0007Bv-Kf for lore@lore.pengutronix.de; Tue, 29 Jun 2021 07:10:32 +0200 Received: from localhost ([127.0.0.1] helo=metis.ext.pengutronix.de) by metis.ext.pengutronix.de with esmtp (Exim 4.92) (envelope-from ) id 1ly611-0007Bk-S3; Tue, 29 Jun 2021 07:10:31 +0200 Received: from drehscheibe.grey.stw.pengutronix.de ([2a0a:edc0:0:c01:1d::a2]) by metis.ext.pengutronix.de with esmtps (TLS1.3:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1ly5zl-0005dm-Gf; Tue, 29 Jun 2021 07:09:13 +0200 Received: from [2a0a:edc0:0:1101:1d::39] (helo=dude03.red.stw.pengutronix.de) by drehscheibe.grey.stw.pengutronix.de with esmtp (Exim 4.92) (envelope-from ) id 1ly5zl-0005cK-0F; Tue, 29 Jun 2021 07:09:13 +0200 Received: from mol by dude03.red.stw.pengutronix.de with local (Exim 4.92) (envelope-from ) id 1ly5zk-00AaWz-Td; Tue, 29 Jun 2021 07:09:12 +0200 From: Michael Olbrich To: ptxdist@pengutronix.de Date: Tue, 29 Jun 2021 07:09:12 +0200 Message-Id: <20210629050912.2523662-1-m.olbrich@pengutronix.de> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20210616161655.15480-3-rhi@pengutronix.de> References: <20210616161655.15480-3-rhi@pengutronix.de> MIME-Version: 1.0 Subject: Re: [ptxdist] [APPLIED] systemd: make hostnamed and quotacheck optional X-BeenThere: ptxdist@pengutronix.de X-Mailman-Version: 2.1.29 Precedence: list List-Id: PTXdist Development Mailing List List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: ptxdist@pengutronix.de Cc: Roland Hieber Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: "ptxdist" X-SA-Exim-Connect-IP: 127.0.0.1 X-SA-Exim-Mail-From: ptxdist-bounces@pengutronix.de X-SA-Exim-Scanned: No (on metis.ext.pengutronix.de); SAEximRunCond expanded to false Thanks, applied as cb4ac069a4c692caeeac38e2dbb68415ffc61121. Michael [sent from post-receive hook] On Tue, 29 Jun 2021 07:09:12 +0200, Roland Hieber wrote: > 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 > Message-Id: <20210616161655.15480-3-rhi@pengutronix.de> > Signed-off-by: Michael Olbrich > > diff --git a/rules/systemd.in b/rules/systemd.in > index 854c344d5441..0c6dcb317613 100644 > --- a/rules/systemd.in > +++ b/rules/systemd.in > @@ -56,11 +56,15 @@ comment "D-Bus is needed for the enabled features" > config SYSTEMD_DBUS > bool > > +config SYSTEMD_DBUS_SERVICES > + bool > + > config SYSTEMD_MICROHTTPD > bool > > config SYSTEMD_LOCALES > bool > + select SYSTEMD_DBUS_SERVICES > default LOCALES > > config SYSTEMD_VCONSOLE > @@ -77,9 +81,19 @@ config SYSTEMD_DISABLE_RANDOM_SEED > the random seed is not possible. > Warning: enabling this option may be insecure. > > +config SYSTEMD_HOSTNAMED > + bool > + default y > + select SYSTEMD_DBUS_SERVICES > + prompt "hostname daemon" > + help > + A tiny daemon that can be used to control the hostname and related > + machine meta data from user programs. > + > config SYSTEMD_LOGIND > bool > select SYSTEMD_DBUS > + select SYSTEMD_DBUS_SERVICES > prompt "login daemon" > > config SYSTEMD_UNITS_USER > @@ -89,6 +103,7 @@ config SYSTEMD_UNITS_USER > > config SYSTEMD_NETWORK > bool > + select SYSTEMD_DBUS_SERVICES > prompt "network configuration with systemd" > > config SYSTEMD_IPMASQUERADE > @@ -102,6 +117,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 +138,13 @@ config SYSTEMD_POLKIT > bool > default POLKIT > > +config SYSTEMD_QUOTACHECK > + bool > + default y > + 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 3a3621fe767e..929a76dd423e 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 \ > @@ -152,7 +152,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) \ > @@ -248,7 +248,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) \ > @@ -257,7 +257,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 \ > @@ -347,7 +347,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) > @@ -377,9 +379,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) _______________________________________________ ptxdist mailing list ptxdist@pengutronix.de To unsubscribe, send a mail with subject "unsubscribe" to ptxdist-request@pengutronix.de