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 +-
 remote/modules/vmplayer/vmplayer.build   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

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"
diff --git a/remote/modules/vmplayer/vmplayer.build b/remote/modules/vmplayer/vmplayer.build
index 1c9887ef..a4dd8a29 100644
--- a/remote/modules/vmplayer/vmplayer.build
+++ b/remote/modules/vmplayer/vmplayer.build
@@ -1,7 +1,7 @@
 fetch_source() {
 	#mount vmware bundle directory
 	[ ! -d /mnt/store ] && mkdir -p /mnt/store
-	if [ "x$(ls /mnt/store)" == "x" ]; then
+	if [ "x$(ls /mnt/store/vmware/*.bundle)" == "x" ]; then
 		mount -t nfs -o ro,async,nolock 132.230.8.113:/srv/vmext /mnt/store || perror "Could not mount vmware bundle directory. Exiting."
 	fi
 	ARCH="$(uname -m)"
-- 
cgit v1.2.3-55-g7522


From 60d5f82fca5ceb727cac9129da2b31f1389b6f05 Mon Sep 17 00:00:00 2001
From: Simon Rettberg
Date: Tue, 4 Jun 2013 16:21:17 +0200
Subject: Add LIB64 var that will be set to lib64 on 64bit or lib on 32bit

---
 helper/system.inc                  | 8 ++++++++
 remote/modules/kdm/kdm.conf.zypper | 2 +-
 remote/modules/pam/pam.conf.zypper | 6 +++---
 3 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/helper/system.inc b/helper/system.inc
index 0cfcfbc6..c37368cb 100644
--- a/helper/system.inc
+++ b/helper/system.inc
@@ -18,3 +18,11 @@ KERNEL_VERSION=$(uname -r)
 # determine number of CPU cores
 CPU_CORES=$(cat /proc/cpuinfo | grep processor | wc -l)
 export MAKEFLAGS="-j$CPU_CORES"
+
+# Determine if we have lib64
+if [ "$(uname -m)x" = "x86_64x" ]; then
+	LIB64="lib64"
+else
+	LIB64="lib"
+fi
+
diff --git a/remote/modules/kdm/kdm.conf.zypper b/remote/modules/kdm/kdm.conf.zypper
index a2266c52..081865b3 100644
--- a/remote/modules/kdm/kdm.conf.zypper
+++ b/remote/modules/kdm/kdm.conf.zypper
@@ -2,7 +2,7 @@ REQUIRED_INSTALLED_PACKAGES="kdm"
 REQUIRED_CONTENT_PACKAGES="kdm kde4-kgreeter-plugins"
 REQUIRED_BINARIES=""
 REQUIRED_DIRECTORIES="	/etc/dbus-1
-			/usr/lib/kde4
+			/usr/$LIB64/kde4
 			/usr/share/dbus-1
 			/usr/share/polkit-1
 			/usr/share/kde4/services
diff --git a/remote/modules/pam/pam.conf.zypper b/remote/modules/pam/pam.conf.zypper
index 58f8bb46..2defe1bb 100644
--- a/remote/modules/pam/pam.conf.zypper
+++ b/remote/modules/pam/pam.conf.zypper
@@ -1,10 +1,10 @@
 REQUIRED_INSTALLED_PACKAGES=" pam_ldap pam pam-devel nss_ldap pam-modules"
 REQUIRED_CONTENT_PACKAGES="	pam_ldap pam pam-devel nss_ldap pam-modules nss-mdns"
 REQUIRED_BINARIES="	mkhomedir_helper"
-REQUIRED_DIRECTORIES="	/lib
-			/usr/lib
+REQUIRED_DIRECTORIES="	/$LIB64
+			/usr/$LIB64
 			/etc/security"
 REQUIRED_SYSTEM_FILES=" /etc/login.defs
                         /etc/securetty
-                        /lib/security"
+                        /$LIB64/security"
 
-- 
cgit v1.2.3-55-g7522


From 6e5dc0fc6f9ae85370fb3873c6d0981947cb4980 Mon Sep 17 00:00:00 2001
From: Simon Rettberg
Date: Tue, 4 Jun 2013 17:09:21 +0200
Subject: [rootfs-stage32] include iptables

---
 remote/rootfs/rootfs-stage32/rootfs-stage32.build | 2 +-
 remote/rootfs/rootfs-stage32/rootfs-stage32.conf  | 7 +++++--
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/remote/rootfs/rootfs-stage32/rootfs-stage32.build b/remote/rootfs/rootfs-stage32/rootfs-stage32.build
index 713c0a3d..162dcdc2 100644
--- a/remote/rootfs/rootfs-stage32/rootfs-stage32.build
+++ b/remote/rootfs/rootfs-stage32/rootfs-stage32.build
@@ -17,7 +17,7 @@ build() {
 	pinfo "Searching binaries from config file in system..."
 	for BIN in ${REQUIRED_BINARIES}
 	do
-		BIN_LOCATION=$(which ${BIN})
+		BIN_LOCATION="$(which ${BIN})"
 		if [ ! -z ${BIN_LOCATION} -a -e ${BIN_LOCATION} ];
 		then
 			get_link_chain ${BIN_LOCATION} >> "${FILELIST}"
diff --git a/remote/rootfs/rootfs-stage32/rootfs-stage32.conf b/remote/rootfs/rootfs-stage32/rootfs-stage32.conf
index 3b47d131..ccdcddce 100644
--- a/remote/rootfs/rootfs-stage32/rootfs-stage32.conf
+++ b/remote/rootfs/rootfs-stage32/rootfs-stage32.conf
@@ -1,6 +1,7 @@
 REQUIRED_MODULES="	kernel"
 REQUIRED_INSTALLED_PACKAGES="nfs-common aufs-tools squashfs-tools whois xfsprogs"
-REQUIRED_BINARIES="	bash
+REQUIRED_BINARIES="
+			bash
 			more
 			less
 			agetty
@@ -29,7 +30,9 @@ REQUIRED_BINARIES="	bash
 			xvidtune
 			bc
 			dirname
-			mkdosfs"
+			mkdosfs
+			iptables
+"
 REQUIRED_LIBRARIES="	libcap
 			libcidn
 			libcom_err
-- 
cgit v1.2.3-55-g7522


From 2a64fb191c1d460d114f23d68a59bbf198137a2f Mon Sep 17 00:00:00 2001
From: Simon Rettberg
Date: Tue, 4 Jun 2013 17:38:37 +0200
Subject: Remove aufs-tools from stage32

---
 remote/rootfs/rootfs-stage32/rootfs-stage32.conf   |  4 +--
 .../rootfs-stage32/rootfs-stage32.conf.zypper      | 31 +---------------------
 2 files changed, 2 insertions(+), 33 deletions(-)

diff --git a/remote/rootfs/rootfs-stage32/rootfs-stage32.conf b/remote/rootfs/rootfs-stage32/rootfs-stage32.conf
index ccdcddce..3436ba18 100644
--- a/remote/rootfs/rootfs-stage32/rootfs-stage32.conf
+++ b/remote/rootfs/rootfs-stage32/rootfs-stage32.conf
@@ -1,5 +1,5 @@
 REQUIRED_MODULES="	kernel"
-REQUIRED_INSTALLED_PACKAGES="nfs-common aufs-tools squashfs-tools whois xfsprogs"
+REQUIRED_INSTALLED_PACKAGES="nfs-common squashfs-tools whois xfsprogs"
 REQUIRED_BINARIES="
 			bash
 			more
@@ -15,7 +15,6 @@ REQUIRED_BINARIES="
 			umount
 			mount.nfs4
 			umount.nfs4
-			mount.aufs
 			fdisk
 			mkfs.xfs
 			rm
@@ -26,7 +25,6 @@ REQUIRED_BINARIES="
 			ssh
 			tput
 			xterm
-			ckbcomp
 			xvidtune
 			bc
 			dirname
diff --git a/remote/rootfs/rootfs-stage32/rootfs-stage32.conf.zypper b/remote/rootfs/rootfs-stage32/rootfs-stage32.conf.zypper
index 2fd5af1a..4d44e2d6 100644
--- a/remote/rootfs/rootfs-stage32/rootfs-stage32.conf.zypper
+++ b/remote/rootfs/rootfs-stage32/rootfs-stage32.conf.zypper
@@ -1,35 +1,6 @@
-pinfo "If aufs install fails, run zypper addrepo http://jftp.inai.de/openSUSE_12.3/ j.eng-i586"
 REQUIRED_MODULES="	kernel"
-REQUIRED_INSTALLED_PACKAGES="nfs-client aufs squashfs"
+REQUIRED_INSTALLED_PACKAGES="nfs-client xfsprogs squashfs timezone"
 REQUIRED_CONTENT_PACKAGES="timezone"
-REQUIRED_BINARIES="	bash
-			agetty
-			cat
-			false
-			loadkeys
-			setfont
-			login
-			sulogin
-			mount
-			umount
-			mount.nfs4
-			umount.nfs4
-			mount.aufs
-			rm
-			ldd
-			strace
-			blkid
-			more
-			modprobe
-			rsyslogd
-			ps
-			scp
-			ssh
-			tput
-			xterm
-			xvidtune
-			bc
-			dirname"
 REQUIRED_LIBRARIES="	libcap
 			libcidn
 			libcom_err
-- 
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(-)

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


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(-)

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