fixes

6 files changed, 8 insertions, 32 deletions

diff --git a/mltk b/mltk
index 2329e707..b53c3976 100755
--- a/mltk
+++ b/mltk
@@ -19,6 +19,8 @@
 SELF=$(readlink -f $0)
 ROOT_DIR=$(dirname ${SELF})
 
+. ${ROOT_DIR}/helper/functions.common.sh
+
 banner () {
 	echo -e "\t           __   __   __    "
 	echo -e "\t.--------.|  | |  |_|  |--."
@@ -51,7 +53,7 @@ print_usage() {
 
 initial_checks() {
 	if [ "x$(whoami)" != "xroot" ]; then
-		echo "ERROR: You need to have root rights to install packages."
+		perror "ERROR: You need to have root rights to install packages."
 		exit 1
 	else
 		banner
diff --git a/remote/setup_tools b/remote/setup_tools
index bb1895d0..64aef3b1 100755
--- a/remote/setup_tools
+++ b/remote/setup_tools
@@ -151,6 +151,7 @@ copyfileswithdependencies ()
 	  		echo -e "\tCopied $BIN"
 	  		echo -e "\t-------------------------------------------------------------------------------------------------------------"
 		done
+		echo -e "\t Copied directory $ENTRY"
 	done
 
 	echo "*********************************************************"
@@ -161,6 +162,7 @@ copyfileswithdependencies ()
 	for ENTRY in ${REQUIRED_FILES}
 	do
 		echo ".${ENTRY}" >> ${COPYFILES_LIST}
+		echo -e "\t Copied file $ENTRY"
 	done
 
 
diff --git a/remote/tools/base/base.conf b/remote/tools/base/base.conf
index 8b5fe899..ff910b29 100644
--- a/remote/tools/base/base.conf
+++ b/remote/tools/base/base.conf
@@ -16,7 +16,6 @@ REQUIRED_BINARIES="	bash
 			strace
 			blkid
 			modprobe
-			xterm
 			rsyslogd
 			ps
 			sshd
diff --git a/remote/tools/policykit/stage32.log b/remote/tools/policykit/stage32.log
deleted file mode 100644
index b70b1b6c..00000000
--- a/remote/tools/policykit/stage32.log
+++ /dev/null
@@ -1,29 +0,0 @@
-Reading package lists...
-Building dependency tree...
-Reading state information...
-libmozjs185-dev is already the newest version.
-0 upgraded, 0 newly installed, 0 to remove and 231 not upgraded.
-
-
-*********************************************************
-*
-*     Copying required binaries from config file...
-*
-*********************************************************
-
-
-
-
-*********************************************************
-*
-*   Copying required directories from config file...
-*
-*********************************************************
-
-
-*********************************************************
-*
-*      Copying required files from config file...
-*
-*********************************************************
-[stage32] Completed file list generation at /home/joe/work/tm-scripts/remote/tools/policykit/build/list_wanted_stage3.2.
diff --git a/remote/tools/systemd/data/etc/systemd/system/openslx-mnt.mount b/remote/tools/systemd/data/etc/systemd/system/openslx-mnt.mount
index 70c1d4c8..995f123f 100644
--- a/remote/tools/systemd/data/etc/systemd/system/openslx-mnt.mount
+++ b/remote/tools/systemd/data/etc/systemd/system/openslx-mnt.mount
@@ -1,6 +1,5 @@
 [Unit]
 Description=Mount NFS Share [TEST]
-After=udhcpc@%i.service
 
 [Mount]
 What=132.230.4.6:/srv/openslx/export/nfs/ubuntu-12.04-test
diff --git a/remote/tools/systemd/systemd.build b/remote/tools/systemd/systemd.build
index d198f821..57c0f6b4 100644
--- a/remote/tools/systemd/systemd.build
+++ b/remote/tools/systemd/systemd.build
@@ -46,4 +46,7 @@ post_copy() {
 	then
 		sed -i.bak "s/ExecStart=-\/sbin\/agetty --noclear %I 38400 linux/ExecStart=-\/sbin\/agetty %I 38400 linux/g" $INIT_DIR/usr/lib/systemd/system/getty@.service
 	fi
+
+	# add nfs to modules-load list
+	echo "nfs" > $INIT_DIR/etc/modules-load.d/nfs.conf
 }