From b9404f13ca882e381a3c1b0797b761ce7638e273 Mon Sep 17 00:00:00 2001
From: Simon Rettberg
Date: Thu, 23 May 2013 20:14:53 +0200
Subject: Remove ldap in initial nsswitch conf, will be added after udev
 started up Update to systemd 204 Remove some systemd services that don't make
 sense in our setup Add own sysctl defaults

---
 remote/modules/systemd/systemd.conf | 50 ++++++++++++++++++++++++++-----------
 1 file changed, 36 insertions(+), 14 deletions(-)

(limited to 'remote/modules/systemd/systemd.conf')

diff --git a/remote/modules/systemd/systemd.conf b/remote/modules/systemd/systemd.conf
index b5e8370d..7f469be6 100644
--- a/remote/modules/systemd/systemd.conf
+++ b/remote/modules/systemd/systemd.conf
@@ -1,7 +1,29 @@
-VERSION=systemd-197
-URL=http://www.freedesktop.org/software/systemd/${VERSION}.tar.xz
-LIBKMOD_VERSION="kmod-12"
-LIBKMOD_URL="http://www.kernel.org/pub/linux/utils/kernel/kmod/${LIBKMOD_VERSION}.tar.gz"
+REQUIRED_VERSION="systemd-204"
+REQUIRED_URL="http://www.freedesktop.org/software/systemd/${REQUIRED_VERSION}.tar.xz"
+REQUIRED_LIBKMOD_VERSION="kmod-12"
+REQUIRED_LIBKMOD_URL="http://www.kernel.org/pub/linux/utils/kernel/kmod/${REQUIRED_LIBKMOD_VERSION}.tar.gz"
+REQUIRED_DISABLED_SERVICES="
+	tmp.mount
+	time-sync.target
+	systemd-random-seed-save.service
+	systemd-random-seed-load.service
+	local-fs-pre.target
+	local-fs.target
+	local-fs.target.wants
+	systemd-remount-fs.service
+	remote-fs.target
+	remote-fs-pre.target
+	initrd-root-fs.target
+	initrd-fs.target
+	systemd-fsck-root.service
+	systemd-fsck@.service
+	sys-kernel-debug.mount
+	nss-lookup.target
+	nss-user-lookup.target
+	systemd-initctl.service
+	systemd-initctl.socket
+	swap.target
+"
 REQUIRED_INSTALLED_PACKAGES="	intltool
 			gperf
 			dbus
@@ -73,13 +95,13 @@ REQUIRED_BINARIES="	hostnamectl
 			mtd_probe
 			scsi_id
 			v4l_id"
-REQUIRED_DIRECTORIES="	/etc
-			/usr/lib
-			/usr/include
-			/usr/share/dbus-1
-			/usr/share/polkit-1
-			/usr/lib/udev/rules.d"
-REQUIRED_FILES="	/usr/bin/systemd-analyze
-			/usr/share/systemd/kbd-model-map
-			/usr/lib/udev/findkeyboards
-			/usr/lib/udev/keyboard-force-release.sh"
+REQUIRED_DIRECTORIES="
+	/etc
+	/usr/include
+	/usr/share/dbus-1
+	/usr/share/polkit-1
+	/usr/lib/udev
+	/usr/lib/systemd
+	/usr/lib/tmpfiles.d
+"
+
-- 
cgit v1.2.3-55-g7522