From 7ee1c573bf73c5f23e66a4502e20df5109596af9 Mon Sep 17 00:00:00 2001
From: Jonathan Bauer
Date: Tue, 4 Jun 2013 14:46:24 +0200
Subject: Fix Simon's stupid bugs in vmplayer and policykit!

---
 remote/modules/policykit/policykit.build | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'remote/modules/policykit')

diff --git a/remote/modules/policykit/policykit.build b/remote/modules/policykit/policykit.build
index 7c2f3991..591c180f 100644
--- a/remote/modules/policykit/policykit.build
+++ b/remote/modules/policykit/policykit.build
@@ -15,7 +15,7 @@ build () {
 
 post_copy() {
 	local POLPATH="$(grep '/polkitd$' "$COPYLIST" | head -1 | sed -e 's/[\/&]/\\&/g')"
-	sed -i "s/%%POLKITD%%/${POLPATH}/g" "$TARGET_BUILD_DIR/etc/systemd/system/polkitd.service"
+	[ -n "$POLPATH" ] && sed -i "s/%%POLKITD%%/${POLPATH}/g" "$TARGET_BUILD_DIR/etc/systemd/system/polkitd.service"
 	#Add Polkit User/Group/Shadow to Stage3.2
 	pinfo "Adding polkitd user to target system..."
 	add_user "polkitd"
-- 
cgit v1.2.3-55-g7522


From 32a7b056f4e3f3031aacbde905a1ee096b40acf3 Mon Sep 17 00:00:00 2001
From: Christian Rößler
Date: Tue, 4 Jun 2013 17:56:29 +0200
Subject: Changed: hardcoded /lib-paths changed to variable 	 LIB64 (=lib,
 =lib64 on 64bit systems)

---
 remote/modules/policykit/policykit.conf.zypper | 3 +--
 remote/modules/rsyslogd/rsyslogd.conf          | 2 +-
 2 files changed, 2 insertions(+), 3 deletions(-)

(limited to 'remote/modules/policykit')

diff --git a/remote/modules/policykit/policykit.conf.zypper b/remote/modules/policykit/policykit.conf.zypper
index 87c0014e..c93181c5 100644
--- a/remote/modules/policykit/policykit.conf.zypper
+++ b/remote/modules/policykit/policykit.conf.zypper
@@ -5,7 +5,6 @@ REQUIRED_DIRECTORIES="	/etc/pam.d /etc/dbus-1 /etc/polkit-1
 			/usr/bin 
 			/usr/share/dbus-1
 			/usr/share/polkit-1
-			/usr/lib/polkit-1
-			/usr${ARCH_LIB_DIR}/polkit-1"
+			/usr/lib/polkit-1"
 REQUIRED_FILES=""
 REQUIRED_LIBRARIES="libmozjs185"
diff --git a/remote/modules/rsyslogd/rsyslogd.conf b/remote/modules/rsyslogd/rsyslogd.conf
index d0d46e77..f5d60989 100644
--- a/remote/modules/rsyslogd/rsyslogd.conf
+++ b/remote/modules/rsyslogd/rsyslogd.conf
@@ -1,4 +1,4 @@
 REQUIRED_CONTENT_PACKAGES="	rsyslog"
 REQUIRED_BINARIES="	rsyslogd"
 REQUIRED_FILES="	/etc/rsyslog.conf"
-REQUIRED_DIRECTORIES="	/usr/lib/rsyslog"
+REQUIRED_DIRECTORIES="	/usr/$LIB64/rsyslog"
-- 
cgit v1.2.3-55-g7522