From ba42fcadd253038dadea8fc93cc0bc4e7cff493a Mon Sep 17 00:00:00 2001
From: Simon Rettberg
Date: Mon, 6 May 2013 19:44:53 +0200
Subject: Add vmplayer module

---
 remote/modules/vmplayer/data/bin/vmplayer |  8 ++++++++
 remote/modules/vmplayer/vmplayer.build    | 25 +++++++++++++++++++++++++
 remote/modules/vmplayer/vmplayer.conf     |  3 +++
 3 files changed, 36 insertions(+)
 create mode 100755 remote/modules/vmplayer/data/bin/vmplayer
 create mode 100644 remote/modules/vmplayer/vmplayer.build
 create mode 100644 remote/modules/vmplayer/vmplayer.conf

(limited to 'remote/modules')

diff --git a/remote/modules/vmplayer/data/bin/vmplayer b/remote/modules/vmplayer/data/bin/vmplayer
new file mode 100755
index 00000000..d4cd1d65
--- /dev/null
+++ b/remote/modules/vmplayer/data/bin/vmplayer
@@ -0,0 +1,8 @@
+#!/bin/sh
+
+for mod in /lib/modules/vmware/*.ko; do
+	insmod "$mod" || xmessage "Could not load kernel module $mod. vmplayer might fail."
+done
+
+/bin/vmplayer-bin $@
+
diff --git a/remote/modules/vmplayer/vmplayer.build b/remote/modules/vmplayer/vmplayer.build
new file mode 100644
index 00000000..f2400380
--- /dev/null
+++ b/remote/modules/vmplayer/vmplayer.build
@@ -0,0 +1,25 @@
+fetch_source() {
+	:
+}
+
+build() {
+	mkdir -p "$MODULE_BUILD_DIR/lib/modules/vmware"
+	mkdir -p "$MODULE_BUILD_DIR/bin"
+	cp "/usr/lib/vmware/bin/vmplayer" "$MODULE_BUILD_DIR/bin/vmplayer-bin" || perror "Could not copy vmplayer binary from /usr/lib/vmware/bin/vmplayer to build dir."
+	cd "/usr/lib/vmware/modules/source" || perror "vmplayer modules source not found. install vmplayer."
+	local tarball
+	for tarball in *.tar; do
+		pinfo "Building $tarball...."
+		tar xf "$tarball" || perror "Could not untar $tarball"
+		cd "${tarball/.tar}-only" || perror "Could not cd to extracted $tarball (tried ${tarball/.tar}-only)"
+		make LINUXINCLUDE="$MODULE_DIR/../kernel/ksrc/usr/include" || perror "Could not build kernel module $tarball"
+		cp "${tarball/.tar}.ko" "$MODULE_BUILD_DIR/lib/modules/vmware/" || perror "Could not copy ${tarball/.tar}.ko to $MODULE_BUILD_DIR/lib/modules/vmware/"
+		cd -
+	done
+	cd -
+}
+
+post_copy() {
+	:
+}
+
diff --git a/remote/modules/vmplayer/vmplayer.conf b/remote/modules/vmplayer/vmplayer.conf
new file mode 100644
index 00000000..b7582397
--- /dev/null
+++ b/remote/modules/vmplayer/vmplayer.conf
@@ -0,0 +1,3 @@
+REQUIRED_BINARIES="vmplayer-bin"
+REQUIRED_SYSTEM_FILES=""
+REQUIRED_DIRECTORIES="/lib"
-- 
cgit v1.2.3-55-g7522


From 16469322a4636dbd7042b1410e132aba6edde629 Mon Sep 17 00:00:00 2001
From: Simon Rettberg
Date: Wed, 8 May 2013 19:51:17 +0200
Subject: Add vmplayer module that extracts from bundle

---
 remote/modules/vmplayer/data/etc/vmware/bootstrap  | 11 ++++
 remote/modules/vmplayer/data/etc/vmware/config     | 19 +++++++
 remote/modules/vmplayer/data/etc/vmware/icu        |  1 +
 .../modules/vmplayer/data/etc/vmware/installer.sh  |  1 +
 remote/modules/vmplayer/data/etc/vmware/networking | 12 +++++
 .../modules/vmplayer/data/etc/vmware/usbarb.rules  |  4 ++
 .../data/etc/vmware/vmnet1/dhcpd/dhcpd.conf        | 40 +++++++++++++++
 .../data/etc/vmware/vmnet1/dhcpd/dhcpd.leases      |  7 +++
 .../data/etc/vmware/vmnet8/dhcpd/dhcpd.conf        | 43 ++++++++++++++++
 .../data/etc/vmware/vmnet8/dhcpd/dhcpd.leases      |  7 +++
 .../vmplayer/data/etc/vmware/vmnet8/nat.mac        |  1 +
 .../vmplayer/data/etc/vmware/vmnet8/nat/nat.conf   | 60 ++++++++++++++++++++++
 remote/modules/vmplayer/vmplayer.build             | 38 +++++++++++---
 remote/modules/vmplayer/vmplayer.conf              |  4 +-
 remote/setup_target                                |  4 +-
 15 files changed, 242 insertions(+), 10 deletions(-)
 create mode 100644 remote/modules/vmplayer/data/etc/vmware/bootstrap
 create mode 100644 remote/modules/vmplayer/data/etc/vmware/config
 create mode 120000 remote/modules/vmplayer/data/etc/vmware/icu
 create mode 120000 remote/modules/vmplayer/data/etc/vmware/installer.sh
 create mode 100644 remote/modules/vmplayer/data/etc/vmware/networking
 create mode 100644 remote/modules/vmplayer/data/etc/vmware/usbarb.rules
 create mode 100644 remote/modules/vmplayer/data/etc/vmware/vmnet1/dhcpd/dhcpd.conf
 create mode 100644 remote/modules/vmplayer/data/etc/vmware/vmnet1/dhcpd/dhcpd.leases
 create mode 100644 remote/modules/vmplayer/data/etc/vmware/vmnet8/dhcpd/dhcpd.conf
 create mode 100644 remote/modules/vmplayer/data/etc/vmware/vmnet8/dhcpd/dhcpd.leases
 create mode 100644 remote/modules/vmplayer/data/etc/vmware/vmnet8/nat.mac
 create mode 100644 remote/modules/vmplayer/data/etc/vmware/vmnet8/nat/nat.conf

(limited to 'remote/modules')

diff --git a/remote/modules/vmplayer/data/etc/vmware/bootstrap b/remote/modules/vmplayer/data/etc/vmware/bootstrap
new file mode 100644
index 00000000..9417c7fe
--- /dev/null
+++ b/remote/modules/vmplayer/data/etc/vmware/bootstrap
@@ -0,0 +1,11 @@
+PREFIX="/usr"
+BINDIR="/usr/bin"
+SBINDIR="/usr/sbin"
+LIBDIR="/usr/lib"
+DATADIR="/usr/share"
+SYSCONFDIR="/etc"
+DOCDIR="/usr/share/doc"
+MANDIR="/usr/share/man"
+INCLUDEDIR="/usr/include"
+INITDIR="/etc/init.d"
+INITSCRIPTDIR="/etc/init.d"
diff --git a/remote/modules/vmplayer/data/etc/vmware/config b/remote/modules/vmplayer/data/etc/vmware/config
new file mode 100644
index 00000000..5a62a179
--- /dev/null
+++ b/remote/modules/vmplayer/data/etc/vmware/config
@@ -0,0 +1,19 @@
+.encoding = "UTF-8"
+NETWORKING = "yes"
+VMBLOCK_CONFED = "no"
+gksu.rootMethod = "su"
+libdir = "/usr/lib/vmware"
+VMCI_CONFED = "no"
+VSOCK_CONFED = "no"
+initscriptdir = "/etc/init.d"
+authd.fullpath = "/usr/sbin/vmware-authd"
+bindir = "/usr/bin"
+installerDefaults.componentDownloadEnabled = "yes"
+installerDefaults.autoSoftwareUpdateEnabled.epoch = "4837526839"
+vix.config.version = "1"
+player.product.version = "5.0.2"
+installerDefaults.dataCollectionEnabled.epoch = "9979927113"
+installerDefaults.dataCollectionEnabled = "no"
+installerDefaults.transferVersion = "1"
+installerDefaults.autoSoftwareUpdateEnabled = "no"
+product.buildNumber = "1031769"
diff --git a/remote/modules/vmplayer/data/etc/vmware/icu b/remote/modules/vmplayer/data/etc/vmware/icu
new file mode 120000
index 00000000..d1ebea7d
--- /dev/null
+++ b/remote/modules/vmplayer/data/etc/vmware/icu
@@ -0,0 +1 @@
+/usr/lib/vmware/icu
\ No newline at end of file
diff --git a/remote/modules/vmplayer/data/etc/vmware/installer.sh b/remote/modules/vmplayer/data/etc/vmware/installer.sh
new file mode 120000
index 00000000..f178b8cc
--- /dev/null
+++ b/remote/modules/vmplayer/data/etc/vmware/installer.sh
@@ -0,0 +1 @@
+/usr/lib/vmware-installer/2.1.0/vmware-uninstall-downgrade
\ No newline at end of file
diff --git a/remote/modules/vmplayer/data/etc/vmware/networking b/remote/modules/vmplayer/data/etc/vmware/networking
new file mode 100644
index 00000000..d2ea7361
--- /dev/null
+++ b/remote/modules/vmplayer/data/etc/vmware/networking
@@ -0,0 +1,12 @@
+VERSION=1,0
+answer VNET_1_DHCP yes
+answer VNET_1_DHCP_CFG_HASH ABD785E9C7BA236946CF10ED6B15A580E522B13D
+answer VNET_1_HOSTONLY_NETMASK 255.255.255.0
+answer VNET_1_HOSTONLY_SUBNET 172.16.110.0
+answer VNET_1_VIRTUAL_ADAPTER yes
+answer VNET_8_DHCP yes
+answer VNET_8_DHCP_CFG_HASH 5E30544D23705A65173565BC8D6C51008A0F9AF2
+answer VNET_8_HOSTONLY_NETMASK 255.255.255.0
+answer VNET_8_HOSTONLY_SUBNET 192.168.167.0
+answer VNET_8_NAT yes
+answer VNET_8_VIRTUAL_ADAPTER yes
diff --git a/remote/modules/vmplayer/data/etc/vmware/usbarb.rules b/remote/modules/vmplayer/data/etc/vmware/usbarb.rules
new file mode 100644
index 00000000..c3198bb4
--- /dev/null
+++ b/remote/modules/vmplayer/data/etc/vmware/usbarb.rules
@@ -0,0 +1,4 @@
+{
+  "version": 1,
+  "rules": []
+}
\ No newline at end of file
diff --git a/remote/modules/vmplayer/data/etc/vmware/vmnet1/dhcpd/dhcpd.conf b/remote/modules/vmplayer/data/etc/vmware/vmnet1/dhcpd/dhcpd.conf
new file mode 100644
index 00000000..6aeb3f1e
--- /dev/null
+++ b/remote/modules/vmplayer/data/etc/vmware/vmnet1/dhcpd/dhcpd.conf
@@ -0,0 +1,40 @@
+# Configuration file for ISC 2.0 vmnet-dhcpd operating on vmnet1.
+#
+# This file was automatically generated by the VMware configuration program.
+# See Instructions below if you want to modify it.
+#
+# We set domain-name-servers to make some DHCP clients happy
+# (dhclient as configured in SuSE, TurboLinux, etc.).
+# We also supply a domain name to make pump (Red Hat 6.x) happy.
+#
+
+
+###### VMNET DHCP Configuration. Start of "DO NOT MODIFY SECTION" #####
+# Modification Instructions: This section of the configuration file contains
+# information generated by the configuration program. Do not modify this
+# section.
+# You are free to modify everything else. Also, this section must start 
+# on a new line 
+# This file will get backed up with a different name in the same directory 
+# if this section is edited and you try to configure DHCP again.
+
+# Written at: 05/06/2013 17:43:41
+allow unknown-clients;
+default-lease-time 1800;                # default is 30 minutes
+max-lease-time 7200;                    # default is 2 hours
+
+subnet 172.16.110.0 netmask 255.255.255.0 {
+	range 172.16.110.128 172.16.110.254;
+	option broadcast-address 172.16.110.255;
+	option domain-name-servers 172.16.110.1;
+	option domain-name localdomain;
+	default-lease-time 1800;                # default is 30 minutes
+	max-lease-time 7200;                    # default is 2 hours
+}
+host vmnet1 {
+	hardware ethernet 00:50:56:C0:00:01;
+	fixed-address 172.16.110.1;
+	option domain-name-servers 0.0.0.0;
+	option domain-name "";
+}
+####### VMNET DHCP Configuration. End of "DO NOT MODIFY SECTION" #######
diff --git a/remote/modules/vmplayer/data/etc/vmware/vmnet1/dhcpd/dhcpd.leases b/remote/modules/vmplayer/data/etc/vmware/vmnet1/dhcpd/dhcpd.leases
new file mode 100644
index 00000000..512c0de2
--- /dev/null
+++ b/remote/modules/vmplayer/data/etc/vmware/vmnet1/dhcpd/dhcpd.leases
@@ -0,0 +1,7 @@
+# All times in this file are in UTC (GMT), not your local timezone.   This is
+# not a bug, so please don't ask about it.   There is no portable way to
+# store leases in the local timezone, so please don't request this as a
+# feature.   If this is inconvenient or confusing to you, we sincerely
+# apologize.   Seriously, though - don't ask.
+# The format of this file is documented in the dhcpd.leases(5) manual page.
+
diff --git a/remote/modules/vmplayer/data/etc/vmware/vmnet8/dhcpd/dhcpd.conf b/remote/modules/vmplayer/data/etc/vmware/vmnet8/dhcpd/dhcpd.conf
new file mode 100644
index 00000000..9f27b6f0
--- /dev/null
+++ b/remote/modules/vmplayer/data/etc/vmware/vmnet8/dhcpd/dhcpd.conf
@@ -0,0 +1,43 @@
+# Configuration file for ISC 2.0 vmnet-dhcpd operating on vmnet8.
+#
+# This file was automatically generated by the VMware configuration program.
+# See Instructions below if you want to modify it.
+#
+# We set domain-name-servers to make some DHCP clients happy
+# (dhclient as configured in SuSE, TurboLinux, etc.).
+# We also supply a domain name to make pump (Red Hat 6.x) happy.
+#
+
+
+###### VMNET DHCP Configuration. Start of "DO NOT MODIFY SECTION" #####
+# Modification Instructions: This section of the configuration file contains
+# information generated by the configuration program. Do not modify this
+# section.
+# You are free to modify everything else. Also, this section must start 
+# on a new line 
+# This file will get backed up with a different name in the same directory 
+# if this section is edited and you try to configure DHCP again.
+
+# Written at: 05/06/2013 17:43:41
+allow unknown-clients;
+default-lease-time 1800;                # default is 30 minutes
+max-lease-time 7200;                    # default is 2 hours
+
+subnet 192.168.167.0 netmask 255.255.255.0 {
+	range 192.168.167.128 192.168.167.254;
+	option broadcast-address 192.168.167.255;
+	option domain-name-servers 192.168.167.2;
+	option domain-name localdomain;
+	default-lease-time 1800;                # default is 30 minutes
+	max-lease-time 7200;                    # default is 2 hours
+	option netbios-name-servers 192.168.167.2;
+	option routers 192.168.167.2;
+}
+host vmnet8 {
+	hardware ethernet 00:50:56:C0:00:08;
+	fixed-address 192.168.167.1;
+	option domain-name-servers 0.0.0.0;
+	option domain-name "";
+	option routers 0.0.0.0;
+}
+####### VMNET DHCP Configuration. End of "DO NOT MODIFY SECTION" #######
diff --git a/remote/modules/vmplayer/data/etc/vmware/vmnet8/dhcpd/dhcpd.leases b/remote/modules/vmplayer/data/etc/vmware/vmnet8/dhcpd/dhcpd.leases
new file mode 100644
index 00000000..512c0de2
--- /dev/null
+++ b/remote/modules/vmplayer/data/etc/vmware/vmnet8/dhcpd/dhcpd.leases
@@ -0,0 +1,7 @@
+# All times in this file are in UTC (GMT), not your local timezone.   This is
+# not a bug, so please don't ask about it.   There is no portable way to
+# store leases in the local timezone, so please don't request this as a
+# feature.   If this is inconvenient or confusing to you, we sincerely
+# apologize.   Seriously, though - don't ask.
+# The format of this file is documented in the dhcpd.leases(5) manual page.
+
diff --git a/remote/modules/vmplayer/data/etc/vmware/vmnet8/nat.mac b/remote/modules/vmplayer/data/etc/vmware/vmnet8/nat.mac
new file mode 100644
index 00000000..337d094a
--- /dev/null
+++ b/remote/modules/vmplayer/data/etc/vmware/vmnet8/nat.mac
@@ -0,0 +1 @@
+00:50:56:E9:43:27
diff --git a/remote/modules/vmplayer/data/etc/vmware/vmnet8/nat/nat.conf b/remote/modules/vmplayer/data/etc/vmware/vmnet8/nat/nat.conf
new file mode 100644
index 00000000..791f9a7e
--- /dev/null
+++ b/remote/modules/vmplayer/data/etc/vmware/vmnet8/nat/nat.conf
@@ -0,0 +1,60 @@
+# VMware NAT configuration file
+
+[host]
+
+# NAT gateway address
+ip = 192.168.167.2
+netmask = 255.255.255.0
+
+# VMnet device if not specified on command line
+device = /dev/vmnet8
+
+# Allow PORT/EPRT FTP commands (they need incoming TCP stream ...)
+activeFTP = 1
+
+# Allows the source to have any OUI.  Turn this on if you change the OUI
+# in the MAC address of your virtual machines.
+allowAnyOUI = 1
+
+# Controls if (TCP) connections should be reset when the adapter they are
+# bound to goes down
+resetConnectionOnLinkDown = 1
+
+# Controls if (TCP) connection should be reset when guest packet's destination
+# is NAT's IP address
+resetConnectionOnDestLocalHost = 1
+
+[tcp]
+
+# Value of timeout in TCP TIME_WAIT state, in seconds
+timeWaitTimeout = 30
+
+[udp]
+
+# Timeout in seconds. Dynamically-created UDP mappings will purged if
+# idle for this duration of time 0 = no timeout, default = 60; real
+# value might be up to 100% longer
+timeout = 60
+
+[netbios]
+# Timeout for NBNS queries.
+nbnsTimeout = 2
+
+# Number of retries for each NBNS query.
+nbnsRetries = 3
+
+# Timeout for NBDS queries.
+nbdsTimeout = 3
+
+[incomingtcp]
+
+# Use these with care - anyone can enter into your VM through these...
+# The format and example are as follows:
+#<external port number> = <VM's IP address>:<VM's port number>
+#8080 = 172.16.3.128:80
+
+[incomingudp]
+
+# UDP port forwarding example
+#6000 = 172.16.3.0:6001
+
diff --git a/remote/modules/vmplayer/vmplayer.build b/remote/modules/vmplayer/vmplayer.build
index f2400380..eb6fc8e5 100644
--- a/remote/modules/vmplayer/vmplayer.build
+++ b/remote/modules/vmplayer/vmplayer.build
@@ -1,22 +1,48 @@
 fetch_source() {
-	:
+	ARCH=$(uname -m)
+	[ "$ARCH" = "i686" ] && ARCH=i386
+	local BUNDLE="$(find /mnt/store/vmware -type f -name "VMware-Player*.${ARCH}.bundle" | head -1)"
+	[ -z "$BUNDLE" ] && perror "Could not find vmplayer at /mnt/store for ARCH = $ARCH"
+	[ -e "./src" ] && { rm -r ./src || perror "Could not delete old src dir."; }
+	pinfo "Extracting bundle"
+	$BUNDLE -x ./src/ || perror "Extracting the vmplayer bundle failed."
+	pinfo "done"
 }
 
 build() {
-	mkdir -p "$MODULE_BUILD_DIR/lib/modules/vmware"
-	mkdir -p "$MODULE_BUILD_DIR/bin"
-	cp "/usr/lib/vmware/bin/vmplayer" "$MODULE_BUILD_DIR/bin/vmplayer-bin" || perror "Could not copy vmplayer binary from /usr/lib/vmware/bin/vmplayer to build dir."
-	cd "/usr/lib/vmware/modules/source" || perror "vmplayer modules source not found. install vmplayer."
+	[ ! -d "./src/vmware-player" ] && perror "Extracted vmplayer bundle not found in ./src - please clean vmplayer module."
+	local TARGET="$MODULE_BUILD_DIR/usr/lib/vmware/"
+	mkdir -p "$TARGET"{lib,share,bin}
+	pinfo "Copying data to build dir"
+	cp -r ./src/vmware-installer/lib/lib* "$TARGET" || perror "Could not copy libs from vmware-installer"
+	cp -r ./src/vmware-network-editor/lib "$MODULE_BUILD_DIR/usr/" || perror "Could not copy libs from vmware-network-config"
+	cp -r ./src/vmware-player/lib/share "$TARGET" || perror "Could not copy lib/share from vmware-player"
+	cp -r ./src/vmware-player/share "$MODULE_BUILD_DIR/usr/" || perror "C0oudld not copy share from vmware-player"
+	cp -r ./src/vmware-player-app/etc "$MODULE_BUILD_DIR/" || perror "Could not copy bin and etc from vmware-player-app."
+	cp -r ./src/vmware-player-app/lib/* "$TARGET" || perror "Could not copy lib subtree from vmware-player-app."
+	cp -r ./src/vmware-player-app/{bin,share} "$MODULE_BUILD_DIR/usr/" || perror "could not copy share from vmware-player-app."
+	cp -r ./src/vmware-usbarbitrator/bin "$MODULE_BUILD_DIR/usr/" || perror "Could not copy bin from vmware-usbarbitrator."
+	cp -r ./src/vmware-vmx/{bin,etc,sbin} "$MODULE_BUILD_DIR/usr/" || perror "could not copy bin,etc,sbin to usr for vmare-vmx."
+	cp -r ./src/vmware-vmx/lib/{bin,icu,lib,libconf,scripts} "$TARGET" || perror "Could not copy many things from vmware-vmx."
+	ln -s /usr/lib/vmware/bin/appLoader "$TARGET/bin/vmplayer" || perror "Could not link vmplayer to appLoader."
+	chmod +x "$TARGET"/bin/*
+	chmod +x "$MODULE_BUILD_DIR"/bin/*
+	chmod +x "$MODULE_BUILD_DIR"/sbin/*
+	# Compile kernel modules
+	return 0 # TODO: Fix kompalieren
+	pinfo "Compiling required kernel modules."
+	cd "./src/vmware-vmx/lib/modules/source" || perror "vmplayer modules source not found."
 	local tarball
 	for tarball in *.tar; do
 		pinfo "Building $tarball...."
 		tar xf "$tarball" || perror "Could not untar $tarball"
 		cd "${tarball/.tar}-only" || perror "Could not cd to extracted $tarball (tried ${tarball/.tar}-only)"
-		make LINUXINCLUDE="$MODULE_DIR/../kernel/ksrc/usr/include" || perror "Could not build kernel module $tarball"
+		make LINUXINCLUDE="${TARGET_DIR}/kernel/build/headers/include" || perror "Could not build kernel module $tarball"
 		cp "${tarball/.tar}.ko" "$MODULE_BUILD_DIR/lib/modules/vmware/" || perror "Could not copy ${tarball/.tar}.ko to $MODULE_BUILD_DIR/lib/modules/vmware/"
 		cd -
 	done
 	cd -
+	tarcopy "/usr/lib/gconv $(which gconftool-2)" "$MODULE_BUILD_DIR"
 }
 
 post_copy() {
diff --git a/remote/modules/vmplayer/vmplayer.conf b/remote/modules/vmplayer/vmplayer.conf
index b7582397..65fda83d 100644
--- a/remote/modules/vmplayer/vmplayer.conf
+++ b/remote/modules/vmplayer/vmplayer.conf
@@ -1,3 +1,3 @@
-REQUIRED_BINARIES="vmplayer-bin"
+REQUIRED_BINARIES=""
 REQUIRED_SYSTEM_FILES=""
-REQUIRED_DIRECTORIES="/lib"
+REQUIRED_DIRECTORIES="/bin /etc /lib /usr"
diff --git a/remote/setup_target b/remote/setup_target
index 924450fd..f5e5f9e7 100755
--- a/remote/setup_target
+++ b/remote/setup_target
@@ -213,11 +213,11 @@ process_module() {
 		install_dependencies
 		pinfo "## Fetching source"
 		[ -e "${MODULE_DIR}/.fetched_source" ] || { fetch_source && touch "${MODULE_DIR}/.fetched_source"; }
-		if [ -e "${MODULE_DIR}/.built" -a -d "${MODULE_DIR}/build" ]; then
+		if [ -e "${MODULE_DIR}/.built" -a -d "${MODULE_BUILD_DIR}" ]; then
 			pinfo "# built-flag is set, skipping build..."
 		else
 			pinfo "## Building"
-			mkdir -p "${MODULE_DIR}/build" || perror "Could not create build dir"
+			mkdir -p "${MODULE_BUILD_DIR}" || perror "Could not create build dir"
 			build # calls perror if something fails, no need to do that here
 			touch "${MODULE_DIR}/.built" || pwarning "Error setting built-flag"
 		fi
-- 
cgit v1.2.3-55-g7522


From 696285e8a8e3fc2e0b98791fa295ece6d8d0c967 Mon Sep 17 00:00:00 2001
From: Simon Rettberg
Date: Wed, 8 May 2013 20:52:08 +0200
Subject: Add autofs ko to stage3.2 Fix nfs-mount.service to use proper path

---
 remote/modules/systemd/data/etc/systemd/system/nfs-mount.service | 2 +-
 remote/rootfs/rootfs-stage32/rootfs-stage32.conf                 | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

(limited to 'remote/modules')

diff --git a/remote/modules/systemd/data/etc/systemd/system/nfs-mount.service b/remote/modules/systemd/data/etc/systemd/system/nfs-mount.service
index 408bc053..a2f9dc54 100644
--- a/remote/modules/systemd/data/etc/systemd/system/nfs-mount.service
+++ b/remote/modules/systemd/data/etc/systemd/system/nfs-mount.service
@@ -4,4 +4,4 @@ Description=Mount NFS Share [TEST]
 [Service]
 Type=oneshot
 RemainAfterExit=yes
-ExecStart=/usr/sbin/mountexport
+ExecStart=/opt/openslx/bin/mountexport
diff --git a/remote/rootfs/rootfs-stage32/rootfs-stage32.conf b/remote/rootfs/rootfs-stage32/rootfs-stage32.conf
index 90faa567..1bb26a8a 100644
--- a/remote/rootfs/rootfs-stage32/rootfs-stage32.conf
+++ b/remote/rootfs/rootfs-stage32/rootfs-stage32.conf
@@ -115,7 +115,8 @@ REQUIRED_KERNEL_MODULES="	kernel/drivers/cpufreq
 				kernel/fs
 				kernel/crypto
 				kernel/net
-				kernel/sound"
+				kernel/sound
+				kernel/fs/autofs4/autofs4"
 REQUIRED_FIRMWARE="		3com
 				acenic
 				adaptec
-- 
cgit v1.2.3-55-g7522


From 1d967a6a9c838a48314329ce87304d954fb7a19f Mon Sep 17 00:00:00 2001
From: Jonathan Bauer
Date: Thu, 9 May 2013 14:59:22 +0200
Subject: rsyslog fix (michi finger weg\!)

---
 remote/modules/rsyslogd/data/etc/rsyslog.conf | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'remote/modules')

diff --git a/remote/modules/rsyslogd/data/etc/rsyslog.conf b/remote/modules/rsyslogd/data/etc/rsyslog.conf
index c002d602..e226906b 100644
--- a/remote/modules/rsyslogd/data/etc/rsyslog.conf
+++ b/remote/modules/rsyslogd/data/etc/rsyslog.conf
@@ -81,4 +81,4 @@ news.notice                     -/var/log/news/news.notice
 daemon.*;mail.*;\
         news.err;\
         *.=debug;*.=info;\
-        *.=notice;*.=warn
+        *.=notice;*.=warn	|/dev/console
-- 
cgit v1.2.3-55-g7522


From 0e725b53326e116aac4043887b9cf7007aad6b92 Mon Sep 17 00:00:00 2001
From: Jonathan Bauer
Date: Thu, 9 May 2013 15:01:55 +0200
Subject: daemon stuff on tty11

---
 remote/modules/rsyslogd/data/etc/rsyslog.conf | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'remote/modules')

diff --git a/remote/modules/rsyslogd/data/etc/rsyslog.conf b/remote/modules/rsyslogd/data/etc/rsyslog.conf
index e226906b..65b4db88 100644
--- a/remote/modules/rsyslogd/data/etc/rsyslog.conf
+++ b/remote/modules/rsyslogd/data/etc/rsyslog.conf
@@ -81,4 +81,4 @@ news.notice                     -/var/log/news/news.notice
 daemon.*;mail.*;\
         news.err;\
         *.=debug;*.=info;\
-        *.=notice;*.=warn	|/dev/console
+        *.=notice;*.=warn	|/dev/tty11
-- 
cgit v1.2.3-55-g7522


From 37d2c73e373f109d7c1ec31cc625cd2dd7235237 Mon Sep 17 00:00:00 2001
From: Jonathan Bauer
Date: Thu, 9 May 2013 16:44:17 +0200
Subject: ldap fix for suse

---
 remote/modules/pam/data/etc/openldap/ldap.conf   | 1 +
 remote/modules/pam/data/etc/pam.d/common-session | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)
 create mode 120000 remote/modules/pam/data/etc/openldap/ldap.conf

(limited to 'remote/modules')

diff --git a/remote/modules/pam/data/etc/openldap/ldap.conf b/remote/modules/pam/data/etc/openldap/ldap.conf
new file mode 120000
index 00000000..c0aaf459
--- /dev/null
+++ b/remote/modules/pam/data/etc/openldap/ldap.conf
@@ -0,0 +1 @@
+/etc/ldap.conf
\ No newline at end of file
diff --git a/remote/modules/pam/data/etc/pam.d/common-session b/remote/modules/pam/data/etc/pam.d/common-session
index b130bb1f..25311276 100644
--- a/remote/modules/pam/data/etc/pam.d/common-session
+++ b/remote/modules/pam/data/etc/pam.d/common-session
@@ -28,5 +28,5 @@ session optional			pam_umask.so
 # and here are more per-package modules (the "Additional" block)
 session	[success=1]	pam_unix.so 
 session [success=ok]	pam_ldap.so
-session	optional			pam_ck_connector.so nox11
+session optional 	pam_mkhomedir.so skel=/etc/skel umask=0022
 # end of pam-auth-update config
-- 
cgit v1.2.3-55-g7522


From 0077b1d7e370e27ad0ed086b09e75f9c6d04693d Mon Sep 17 00:00:00 2001
From: Jonathan Bauer
Date: Thu, 9 May 2013 16:58:12 +0200
Subject: add mkhomedir_helper to have temp home directory for ldap users

---
 remote/modules/pam/pam.conf | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'remote/modules')

diff --git a/remote/modules/pam/pam.conf b/remote/modules/pam/pam.conf
index 4f353ade..0afd3ec3 100644
--- a/remote/modules/pam/pam.conf
+++ b/remote/modules/pam/pam.conf
@@ -12,7 +12,8 @@ REQUIRED_PACKAGES="	libpam0g
 REQUIRED_DIRECTORIES="	/lib
 			/usr/lib
 			/etc/security"
-REQUIRED_SYSTEM_FILES="	/etc/pam.conf
+REQUIRED_SYSTEM_FILES="	/sbin/mkhomedir_helper
+			/etc/pam.conf
 			/etc/login.defs
 			/etc/securetty
 			/etc/default/locale
-- 
cgit v1.2.3-55-g7522