host bridge interface

11 files changed, 22 insertions, 37 deletions

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.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/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/modules/systemd/data/usr/lib/udev/rules.d/99-systemd.rules b/remote/modules/systemd/data/usr/lib/udev/rules.d/99-systemd.rules
index d18123fd..3a64e06e 100644
--- a/remote/modules/systemd/data/usr/lib/udev/rules.d/99-systemd.rules
+++ b/remote/modules/systemd/data/usr/lib/udev/rules.d/99-systemd.rules
@@ -31,7 +31,7 @@ SUBSYSTEM=="block", KERNEL!="ram*|loop*", ENV{DM_UUID}=="CRYPT-*", ENV{ID_PART_T
 #
 # http://git.kernel.org/?p=linux/hotplug/udev.git;a=blob;f=libudev/libudev-enumerate.c;h=da831449dcaf5e936a14409e8e68ab12d30a98e2;hb=HEAD#l742
 
-SUBSYSTEM=="net", KERNEL!="lo|vmnet*", TAG+="systemd", ENV{SYSTEMD_ALIAS}="/sys/subsystem/net/devices/$name", ENV{SYSTEMD_WANTS}="network-interface@$name.service"
+SUBSYSTEM=="net", KERNEL!="lo|vmnet*|eth*", TAG+="systemd", ENV{SYSTEMD_ALIAS}="/sys/subsystem/net/devices/$name", ENV{SYSTEMD_WANTS}="network-interface@$name.service"
 SUBSYSTEM=="bluetooth", TAG+="systemd", ENV{SYSTEMD_ALIAS}="/sys/subsystem/bluetooth/devices/%k"
 
 SUBSYSTEM=="bluetooth", TAG+="systemd", ENV{SYSTEMD_WANTS}="bluetooth.target"
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
+"
diff --git a/remote/modules/vmplayer/data/etc/openslx/vmware/vmware-env b/remote/modules/vmplayer/data/etc/openslx/vmware/vmware-env
index 6200c981..f1f52040 100755
--- a/remote/modules/vmplayer/data/etc/openslx/vmware/vmware-env
+++ b/remote/modules/vmplayer/data/etc/openslx/vmware/vmware-env
@@ -18,24 +18,6 @@ VMWARE_CONF_DIR=/etc/openslx/vmware
 . /opt/openslx/config
 . ${VMWARE_CONF_DIR}/vmware.conf
 
-setup_bridge() {
-	# Init hook to create a bridge on the active network interface
-	# (should be kept identical to the files of virtualbox and qemukvm plugins)
-	#############################################################################
-
-	local bridge=br0
-	local brnwif=eth0
-	local nwifmac=${SLX_PXE_MAC}
-
-	# bridge 0 already defined or some other problem
-	brctl addbr ${bridge} 
-	brctl stp ${bridge} 0
-	brctl setfd ${bridge} 0.000000000001
-	ip link set addr ${nwifmac} ${bridge}
-	ip link set dev ${nwif} up
-	brctl addif ${bridge} ${nwif}
-}
-
 vm_dhcpd() {
 
    #from plugins/vmware/init-hooks/60-have-servconfig/vm-dhcpd.sh
@@ -233,8 +215,7 @@ if [ -n "$vmnet8" ] ; then
   ip link set vmnet8 up
   echo "1" >/proc/sys/net/ipv4/conf/vmnet8/forwarding
   echo "1" >/proc/sys/net/ipv4/conf/br0/forwarding 2>/dev/null
-  #  TODO: iptables in stage32?
-  #  iptables -t nat -A POSTROUTING -o br0 -j MASQUERADE
+  iptables -t nat -A POSTROUTING -o br0 -j MASQUERADE
    # /etc/vmware/vmnet-natd-8.mac simply contains a mac like 00:50:56:F1:30:50
    $location/vmnet-natd -d /var/run/vmnet-natd-8.pid \
       -m /etc/vmware/vmnet-natd-8.mac -c /etc/vmware/nat.conf  # or logfile 
@@ -254,7 +235,6 @@ vmblock () {
 case "$1" in 
   start)
     #start: defines start function for initscript
-    vm_dhcpd
     setup_network
 #   adapt_tmpfs 
     # hack to access the first serial/parallel port
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)"