On Thu, Jul 14, 2011 at 12:20:54AM +0200, Lennart Poettering <lenn...@poettering.net> wrote: > Neither hostnamed, nor logind/pam_systemd, nor localed, nor timedated > are necessary on most embedded setups. I'd be happy to merge a patch > that makes them individually disabable.
Hi Lennart, I'm attaching a patch adding --disable-hostnamed. Thanks.
From 54e1f63cfedab9e2af5fc61b5d7f0ac5ef6de86d Mon Sep 17 00:00:00 2001
From: Miklos Vajna <vmik...@frugalware.org>
Date: Sun, 24 Jul 2011 17:08:44 +0200
Subject: [PATCH] build-sys: Add --disable-hostnamed configure switch
---
Makefile.am | 50 +++++++++++++++++++++++++++++++++++++++++---------
configure.ac | 8 ++++++++
2 files changed, 49 insertions(+), 9 deletions(-)
diff --git a/Makefile.am b/Makefile.am
index 78c76d7..5faae15 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -170,7 +170,6 @@ rootlibexec_PROGRAMS = \
systemd-ac-power \
systemd-detect-virt \
systemd-sysctl \
- systemd-hostnamed \
systemd-localed \
systemd-timedated \
systemd-logind \
@@ -181,6 +180,11 @@ rootlibexec_PROGRAMS += \
systemd-binfmt
endif
+if ENABLE_HOSTNAMED
+rootlibexec_PROGRAMS += \
+ systemd-hostnamed
+endif
+
systemgenerator_PROGRAMS = \
systemd-getty-generator
@@ -225,18 +229,26 @@ dist_pkgsysconf_DATA = \
dist_dbuspolicy_DATA = \
src/org.freedesktop.systemd1.conf \
- src/org.freedesktop.hostname1.conf \
src/org.freedesktop.locale1.conf \
src/org.freedesktop.timedate1.conf \
src/org.freedesktop.login1.conf
+if ENABLE_HOSTNAMED
+dist_dbuspolicy_DATA += \
+ src/org.freedesktop.hostname1.conf
+endif
+
dist_dbussystemservice_DATA = \
src/org.freedesktop.systemd1.service \
- src/org.freedesktop.hostname1.service \
src/org.freedesktop.locale1.service \
src/org.freedesktop.timedate1.service \
src/org.freedesktop.login1.service
+if ENABLE_HOSTNAMED
+dist_dbussystemservice_DATA += \
+ src/org.freedesktop.hostname1.service
+endif
+
dist_udevrules_DATA = \
src/70-uaccess.rules \
src/71-seat.rules \
@@ -259,10 +271,14 @@ dbusinterface_DATA = \
org.freedesktop.systemd1.Snapshot.xml \
org.freedesktop.systemd1.Swap.xml \
org.freedesktop.systemd1.Path.xml \
- org.freedesktop.hostname1.xml \
org.freedesktop.locale1.xml \
org.freedesktop.timedate1.xml
+if ENABLE_HOSTNAMED
+dbusinterface_DATA += \
+ org.freedesktop.hostname1.xml
+endif
+
dist_bashcompletion_DATA = \
src/systemctl-bash-completion.sh
@@ -347,7 +363,6 @@ nodist_systemunit_DATA = \
units/systemd-initctl.service \
units/systemd-logger.service \
units/systemd-shutdownd.service \
- units/systemd-hostnamed.service \
units/systemd-localed.service \
units/systemd-timedated.service \
units/systemd-logind.service \
@@ -383,6 +398,11 @@ nodist_systemunit_DATA += \
units/systemd-binfmt.service
endif
+if ENABLE_HOSTNAMED
+nodist_systemunit_DATA += \
+ units/systemd-hostnamed.service
+endif
+
dist_userunit_DATA = \
units/user/default.target \
units/user/exit.target
@@ -398,7 +418,6 @@ EXTRA_DIST = \
units/systemd-initctl.service.in \
units/systemd-logger.service.in \
units/systemd-shutdownd.service.in \
- units/systemd-hostnamed.service.in \
units/systemd-localed.service.in \
units/systemd-timedated.service.in \
units/systemd-logind.service.in \
@@ -441,6 +460,11 @@ EXTRA_DIST += \
units/systemd-binfmt.service.in
endif
+if ENABLE_HOSTNAMED
+EXTRA_DIST += \
+ units/systemd-hostnamed.service.in
+endif
+
if TARGET_FEDORA
dist_systemunit_DATA += \
units/fedora/prefdm.service \
@@ -501,11 +525,15 @@ pkgconfigdata_DATA = \
# Passed through intltool only
polkitpolicy_in_files = \
- src/org.freedesktop.hostname1.policy.in \
src/org.freedesktop.locale1.policy.in \
src/org.freedesktop.timedate1.policy.in \
src/org.freedesktop.login1.policy.in
+if ENABLE_HOSTNAMED
+polkitpolicy_in_files += \
+ src/org.freedesktop.hostname1.policy.in
+endif
+
# First passed through sed, followed by intltool
polkitpolicy_in_in_files = \
src/org.freedesktop.systemd1.policy.in.in
@@ -1679,10 +1707,9 @@ endif
$(LN_S) graphical.target runlevel5.target && \
$(LN_S) reboot.target runlevel6.target )
( cd $(DESTDIR)$(systemunitdir) && \
- rm -f default.target ctrl-alt-del.target
dbus-org.freedesktop.hostname1.service dbus-org.freedesktop.locale1.service
dbus-org.freedesktop.timedate1.service dbus-org.freedesktop.login1.service
autovt@.service && \
+ rm -f default.target ctrl-alt-del.target
dbus-org.freedesktop.locale1.service dbus-org.freedesktop.timedate1.service
dbus-org.freedesktop.login1.service autovt@.service && \
$(LN_S) graphical.target default.target && \
$(LN_S) reboot.target ctrl-alt-del.target && \
- $(LN_S) systemd-hostnamed.service
dbus-org.freedesktop.hostname1.service && \
$(LN_S) systemd-localed.service
dbus-org.freedesktop.locale1.service && \
$(LN_S) systemd-timedated.service
dbus-org.freedesktop.timedate1.service && \
$(LN_S) systemd-logind.service
dbus-org.freedesktop.login1.service && \
@@ -1731,6 +1758,11 @@ if ENABLE_BINFMT
$(LN_S) ../systemd-binfmt.service systemd-binfmt.service && \
$(LN_S) ../proc-sys-fs-binfmt_misc.automount
proc-sys-fs-binfmt_misc.automount )
endif
+if ENABLE_HOSTNAMED
+ ( cd $(DESTDIR)$(systemunitdir) && \
+ rm -f dbus-org.freedesktop.hostname1.service && \
+ $(LN_S) systemd-hostnamed.service
dbus-org.freedesktop.hostname1.service )
+endif
( cd $(DESTDIR)$(systemunitdir)/basic.target.wants && \
rm -f systemd-tmpfiles-clean.timer && \
$(LN_S) ../systemd-tmpfiles-clean.timer
systemd-tmpfiles-clean.timer )
diff --git a/configure.ac b/configure.ac
index 198a639..8bf47da 100644
--- a/configure.ac
+++ b/configure.ac
@@ -292,6 +292,13 @@ if test "x$enable_binfmt" != "xno"; then
fi
AM_CONDITIONAL(ENABLE_BINFMT, [test "$have_binfmt" = "yes"])
+have_hostnamed=no
+AC_ARG_ENABLE(hostnamed, AS_HELP_STRING([--disable-hostnamed], [disable
hostname daemon]))
+if test "x$enable_hostnamed" != "xno"; then
+ have_hostnamed=yes
+fi
+AM_CONDITIONAL(ENABLE_HOSTNAMED, [test "$have_hostnamed" = "yes"])
+
have_gtk=no
AC_ARG_ENABLE(gtk, AS_HELP_STRING([--disable-gtk], [disable GTK tools]))
if test "x$enable_gtk" != "xno"; then
@@ -552,6 +559,7 @@ AC_MSG_RESULT([
SELinux: ${have_selinux}
ACL: ${have_acl}
binfmt: ${have_binfmt}
+ hostnamed: ${have_hostnamed}
plymouth: ${have_plymouth}
prefix: ${prefix}
root dir: ${with_rootdir}
--
1.7.6
pgp9HJRA7Jb8u.pgp
Description: PGP signature
_______________________________________________ systemd-devel mailing list systemd-devel@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/systemd-devel
