Merge branch 'master' of simonslx:openslx-ng/tm-scripts

8 files changed, 22 insertions, 43 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"
 
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"
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..3436ba18 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_INSTALLED_PACKAGES="nfs-common squashfs-tools whois xfsprogs"
+REQUIRED_BINARIES="
+			bash
 			more
 			less
 			agetty
@@ -14,7 +15,6 @@ REQUIRED_BINARIES="	bash
 			umount
 			mount.nfs4
 			umount.nfs4
-			mount.aufs
 			fdisk
 			mkfs.xfs
 			rm
@@ -25,11 +25,12 @@ REQUIRED_BINARIES="	bash
 			ssh
 			tput
 			xterm
-			ckbcomp
 			xvidtune
 			bc
 			dirname
-			mkdosfs"
+			mkdosfs
+			iptables
+"
 REQUIRED_LIBRARIES="	libcap
 			libcidn
 			libcom_err
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