From 8b87febb42b0da20d4c204ee939eb1ab8a95a03c Mon Sep 17 00:00:00 2001
From: Jonathan Bauer
Date: Tue, 4 Jun 2013 20:48:14 +0200
Subject: [systemd] Enable blkid support

---
 remote/modules/systemd/systemd.build       | 4 ++--
 remote/modules/systemd/systemd.conf        | 7 +++++--
 remote/modules/systemd/systemd.conf.zypper | 7 +++++--
 3 files changed, 12 insertions(+), 6 deletions(-)

(limited to 'remote/modules/systemd')

diff --git a/remote/modules/systemd/systemd.build b/remote/modules/systemd/systemd.build
index d3a58363..a84cc7b3 100644
--- a/remote/modules/systemd/systemd.build
+++ b/remote/modules/systemd/systemd.build
@@ -18,7 +18,7 @@ build () {
 	pinfo "Building systemd"
 	cd "${MODULE_DIR}/src/$REQUIRED_VERSION"
 	pinfo "calling configure"
-	./configure --disable-manpages --enable-split-usr --sysconfdir="/etc" --enable-gtk-doc-html=no --disable-nls --disable-microhttpd --disable-bootchart --disable-quotacheck --disable-hostnamed --disable-timedated --disable-localed --disable-coredump --disable-keymap --without-python || perror "configure failed."
+	./configure --disable-manpages --enable-split-usr --sysconfdir="/etc" --enable-gtk-doc-html=no --disable-nls --disable-microhttpd --disable-bootchart --disable-quotacheck --disable-hostnamed --disable-timedated --disable-localed --disable-coredump --disable-keymap --without-python --enable-blkid || perror "configure failed."
 	pinfo "calling make"
 	make || perror "make failed."
 	pinfo "calling make install"
@@ -34,7 +34,7 @@ build () {
 
 post_copy() {
 	# dont clear systemd log at startup
-	sed -i.bak "s/TTYVTDisallocate=yes/TTYVTDisallocate=no/g" "${TARGET_BUILD_DIR}/usr/lib/systemd/system/getty@.service"
+	sed -i "s/TTYVTDisallocate=yes/TTYVTDisallocate=no/g" "${TARGET_BUILD_DIR}/usr/lib/systemd/system/getty@.service"
 
 	#old agetty version doesn't support --noclear option in getty service
 	if [ "x$(dpkg -s util-linux | grep Version: | cut -d' ' -f2)" == "x2.19.1-2ubuntu3" ];
diff --git a/remote/modules/systemd/systemd.conf b/remote/modules/systemd/systemd.conf
index 7f469be6..19e4084e 100644
--- a/remote/modules/systemd/systemd.conf
+++ b/remote/modules/systemd/systemd.conf
@@ -24,14 +24,17 @@ REQUIRED_DISABLED_SERVICES="
 	systemd-initctl.socket
 	swap.target
 "
-REQUIRED_INSTALLED_PACKAGES="	intltool
+REQUIRED_INSTALLED_PACKAGES="
+			intltool
 			gperf
 			dbus
 			pkg-config
 			libcap-dev
 			libudev-dev
 			libdbus-1-dev
-			xsltproc"
+			xsltproc
+			libblkid-dev
+"
 REQUIRED_BINARIES="	hostnamectl
 			journalctl
 			localectl
diff --git a/remote/modules/systemd/systemd.conf.zypper b/remote/modules/systemd/systemd.conf.zypper
index 60038937..f727789c 100644
--- a/remote/modules/systemd/systemd.conf.zypper
+++ b/remote/modules/systemd/systemd.conf.zypper
@@ -1,7 +1,10 @@
-REQUIRED_INSTALLED_PACKAGES="	intltool
+REQUIRED_INSTALLED_PACKAGES="
+			intltool
 			gperf
 			pkg-config
 			libcap-devel
 			libudev-devel
 			dbus-1-devel
-			libxslt-tools"
+			libxslt-tools
+			libblkid-devel
+"
-- 
cgit v1.2.3-55-g7522