Super duper merge

7 files changed, 25 insertions, 16 deletions

diff --git a/helper/fileutil.inc b/helper/fileutil.inc
index ba1be103..f4cfe298 100644
--- a/helper/fileutil.inc
+++ b/helper/fileutil.inc
@@ -79,6 +79,10 @@ copy_static_data() {
 	cp -r "${MODULE_DIR}/data/"* ${TARGET_BUILD_DIR} || perror "Could not copy static data of ${MODULE}"
 }
 
+copy_system_files() {
+	[ ! -z "$REQUIRED_SYSTEM_FILES" ] && tarcopy "$REQUIRED_SYSTEM_FILES" "$TARGET_BUILD_DIR"
+}
+
 calc_size() {
 
 	local CURRENT_BUILD_SIZE=$(du -bc "${TARGET_BUILD_DIR}" | awk 'END {print $1}')
diff --git a/remote/modules/kdm/kdm.build b/remote/modules/kdm/kdm.build
index a2602301..b5d1be08 100644
--- a/remote/modules/kdm/kdm.build
+++ b/remote/modules/kdm/kdm.build
@@ -22,7 +22,6 @@ post_copy() {
 
 	
 	#copy required icons
-	[ ! -z "$REQUIRED_SYSTEM_FILES" ] && tarcopy "$REQUIRED_SYSTEM_FILES" "$TARGET_BUILD_DIR"
 	gtk-update-icon-cache-3.0 "${TARGET_BUILD_DIR}/usr/share/icons/oxygen/" || pwarning "update-icon-cache-3.0 failed."
 }
 
diff --git a/remote/modules/pam/pam.build b/remote/modules/pam/pam.build
index 9e287c89..4392e64d 100644
--- a/remote/modules/pam/pam.build
+++ b/remote/modules/pam/pam.build
@@ -7,5 +7,5 @@ build() {
 }
 
 post_copy() {	
-	[ ! -z "$REQUIRED_SYSTEM_FILES" ] && tarcopy "$REQUIRED_SYSTEM_FILES" "$TARGET_BUILD_DIR"
+	:
 }
diff --git a/remote/modules/rsyslogd/rsyslogd.build b/remote/modules/rsyslogd/rsyslogd.build
index cee5c7ed..c46adb0d 100644
--- a/remote/modules/rsyslogd/rsyslogd.build
+++ b/remote/modules/rsyslogd/rsyslogd.build
@@ -13,6 +13,8 @@ build() {
 }
 
 post_copy() {
+
+
 	# pwd = module's build dir
 	mkdir -p "${TARGET_BUILD_DIR}"/var/spool/rsyslog
 
diff --git a/remote/modules/rsyslogd/rsyslogd.conf b/remote/modules/rsyslogd/rsyslogd.conf
index 20b5df1b..f027d6e0 100644
--- a/remote/modules/rsyslogd/rsyslogd.conf
+++ b/remote/modules/rsyslogd/rsyslogd.conf
@@ -1,4 +1,5 @@
+REQUIRED_PACKAGES="	rsyslog"
 REQUIRED_BINARIES="	rsyslogd"
-REQUIRED_FILES="	/etc/rsyslog.conf"
-REQUIRED_DIRECTORIES="	/etc/rsyslog.d
-			/usr/lib/rsyslog"
+REQUIRED_DIRECTORIES="	/usr/lib/rsyslog"
+REQUIRED_SYSTEM_FILES="	/etc/rsyslog.conf
+			/etc/rsyslog.d/50-default.conf"
diff --git a/remote/modules/systemd/data/etc/systemd/system/udhcpc@.service b/remote/modules/systemd/data/etc/systemd/system/udhcpc@.service
index e7d4d170..a945e743 100644
--- a/remote/modules/systemd/data/etc/systemd/system/udhcpc@.service
+++ b/remote/modules/systemd/data/etc/systemd/system/udhcpc@.service
@@ -3,7 +3,7 @@ Description=DHCP Client
 
 [Service]
 Type=simple
-ExecStart=/openslx/sbin/udhcpc -O domain -O nissrv -O nisdomain -t 8 -s /etc/udhcpc.openslx.script -i %I
+ExecStart=/openslx/sbin/udhcpc -O domain -O nissrv -O nisdomain -O wpad -t 8 -s /etc/udhcpc.openslx.script -i %I
 
 [Install]
 WantedBy=multi-user.target
diff --git a/remote/setup_target b/remote/setup_target
index 992390a9..15938558 100755
--- a/remote/setup_target
+++ b/remote/setup_target
@@ -220,6 +220,8 @@ process_module() {
 		[ -d "${TARGET_BUILD_DIR}" ] && TARGET_BUILD_SIZE=$(du -bc "${TARGET_BUILD_DIR}" | awk 'END {print $1}') || TARGET_BUILD_SIZE=0
 		pinfo "## Copying files with dependencies"
 		copy_files_with_deps
+		pinfo "## Copying required system files"
+		copy_system_files
 		pinfo "## Copying static module files"
 		copy_static_data
 		pinfo "## Post copy"
@@ -236,28 +238,29 @@ process_module() {
 
 post_process_target() {
 
-local TOOL_STR="$TOOL_STR post_process_target:"
+	local TOOL_STR="$TOOL_STR post_process_target:"
 
-#move systemd files from /lib to /etc/lib
-pinfo "move systemd files from /lib/systemd to /etc/systemd"
+	#move systemd files from /lib to /etc/lib
+	pinfo "move systemd files from /lib/systemd to /etc/systemd"
 
-if [ -d "${TARGET_BUILD_DIR}/lib" ]; then
-	cd "${TARGET_BUILD_DIR}/lib"
-	tarcopy "systemd" "${TARGET_BUILD_DIR}/etc"
-	cd - &> /dev/null
-	rm -r "${TARGET_BUILD_DIR}/lib/systemd"
-fi
+	if [ -d "${TARGET_BUILD_DIR}/lib/systemd" ]; then
+		cd "${TARGET_BUILD_DIR}/lib"
+		tarcopy "systemd" "${TARGET_BUILD_DIR}/etc"
+		cd - &> /dev/null
+		rm -r "${TARGET_BUILD_DIR}/lib/systemd"
+	fi
 
 }
 
 clean_modules() {
 
 	TARGET=$1
+	shift
 	TARGET_DIR="${MODE_DIR}/targets/${TARGET}"
 	TARGET_BUILD_DIR="${MODE_DIR}/builds/${TARGET}"
 	[ -d $TARGET_DIR ] || perror "Given target directory does not exist: $TARGET_DIR"
 
-	if [ "x$2" = "x" -o "x$2" = "xall" ]; then
+	if [ "x$1" = "x" -o "x$1" = "xall" ]; then
 		if [ -e ${ROOT_DIR}/logs/${TARGET}.size ]; then
 			rm "${ROOT_DIR}/logs/${TARGET}.size" || perror "Could not delete logs/${TARGET}.size"
 		fi