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

12 files changed, 65 insertions, 38 deletions

diff --git a/remote/rootfs/rootfs-stage31/data/init b/remote/rootfs/rootfs-stage31/data/init
index 1e41012e..9bda6db1 100755
--- a/remote/rootfs/rootfs-stage31/data/init
+++ b/remote/rootfs/rootfs-stage31/data/init
@@ -22,6 +22,7 @@ mount -n -t tmpfs -o 'mode=755' run "/run"
 [ ! -f /proc/cpuinfo ] && mount -n -t proc proc /proc
 [ ! -d /sys/class ] && mount -n -t sysfs sysfs /sys
 
+echo "1" > /proc/sys/kernel/sysrq
 echo "/sbin/mdev" > /proc/sys/kernel/hotplug
 # read graphic and network adaptor configuration (without proprietary drivers yet)
 
@@ -111,7 +112,7 @@ if [ -n "$nfs" ] ; then
 	mount -t nfs -o ro,async,nolock ${nfsserver}:${nfspath} /rorootfs ||  { echo "Problem mounting NFS-Directory from ${nfsserver}:${nfspath}. Dropping to DEBUG shell."; DEBUG=1; } 	
 else
 	echo "Mounting stage 3.2 as SquashFS"
-	mount -t squashfs /mnt/$(ls /mnt) /rorootfs || { echo "Problem mounting Squashfs. Dropping to DEBUG shell."; DEBUG=1; }
+	mount -t squashfs /mnt/*.sqfs /rorootfs || { echo "Problem mounting Squashfs. Dropping to DEBUG shell."; DEBUG=1; }
 fi
 			
 if [ $DEBUG -ge 1 ]; then
@@ -123,13 +124,14 @@ else
 fi
 
 echo "Building aufs..."
+mv /mnt/modprobing /dev/shm/uniontmp
 #mount -t overlayfs -o lowerdir=/rorootfs,upperdir=/dev/shm/uniontmp overlayfs /mnt
 mount -n -t aufs -o br:/dev/shm/uniontmp:/rorootfs=ro none /mnt
 mkdir -p /mnt/uniontmp /mnt/tmp
 mount -n --move /dev/shm/uniontmp /mnt/uniontmp
 
 # create udev rule for nic we booted from
-[ -e "/mnt/etc/udev/rules.d/70-net-boot-nic-name.rules" ] && echo 'SUBSYSTEM=="net", ACTION=="add", DRIVERS=="?*", ATTR{address}=="'$macaddr'", ATTR{dev_id}=="0x0", ATTR{type}=="1", KERNEL=="eth*", NAME="eth0"' > "/mnt/etc/udev/rules.d/70-net-boot-nic-name.rules"
+echo 'SUBSYSTEM=="net", ACTION=="add", DRIVERS=="?*", ATTR{address}=="'$macaddr'", ATTR{dev_id}=="0x0", ATTR{type}=="1", KERNEL=="eth*", NAME="eth0"' > "/mnt/etc/udev/rules.d/70-net-boot-nic-name.rules"
 
 for mnt in proc sys run ; do
   umount -n $mnt
diff --git a/remote/rootfs/rootfs-stage31/rootfs-stage31.build b/remote/rootfs/rootfs-stage31/rootfs-stage31.build
index 19a5838a..9e4d7663 100644
--- a/remote/rootfs/rootfs-stage31/rootfs-stage31.build
+++ b/remote/rootfs/rootfs-stage31/rootfs-stage31.build
@@ -24,9 +24,9 @@ post_copy() {
         copy_firmware
 	copy_kernel
 
-	# copy busybox that has been under /openslx back to /
-	cp -r "${TARGET_BUILD_DIR}"/openslx/* "${TARGET_BUILD_DIR}"
-	rm -rf "${TARGET_BUILD_DIR}/openslx"
+	# copy busybox that has been under /opt/openslx back to /
+	cp -r "${TARGET_BUILD_DIR}"/opt/openslx/* "${TARGET_BUILD_DIR}"
+	rm -rf "${TARGET_BUILD_DIR}/opt/openslx"
 }
 
 #
diff --git a/remote/rootfs/rootfs-stage31/rootfs-stage31.conf b/remote/rootfs/rootfs-stage31/rootfs-stage31.conf
index b39895e2..521b45ed 100644
--- a/remote/rootfs/rootfs-stage31/rootfs-stage31.conf
+++ b/remote/rootfs/rootfs-stage31/rootfs-stage31.conf
@@ -4,6 +4,7 @@ REQUIRED_KERNEL_MODULES="	kernel/drivers/video/sis/sisfb.ko
 				kernel/drivers/video/via/viafb.ko
         	               	kernel/drivers/acpi/video.ko
                 	       	kernel/drivers/ssb/ssb.ko
+				kernel/drivers/acpi/button.ko
 	                       	kernel/drivers/gpu/drm/drm*.ko
 	                       	kernel/drivers/gpu/drm/*/*.ko
 				kernel/drivers/i2c/algos/i2c-algo-bit.ko
diff --git a/remote/rootfs/rootfs-stage32/data/etc/modprobe.d/blacklist b/remote/rootfs/rootfs-stage32/data/etc/modprobe.d/blacklist
new file mode 100644
index 00000000..cedabdcb
--- /dev/null
+++ b/remote/rootfs/rootfs-stage32/data/etc/modprobe.d/blacklist
@@ -0,0 +1,3 @@
+# evbug byebye
+blacklist evbug
+blacklist pcspkr
diff --git a/remote/rootfs/rootfs-stage32/data/etc/udhcpc.openslx.script b/remote/rootfs/rootfs-stage32/data/etc/openslx/udhcpc.openslx.script
index b4cd0ee5..199495aa 100755
--- a/remote/rootfs/rootfs-stage32/data/etc/udhcpc.openslx.script
+++ b/remote/rootfs/rootfs-stage32/data/etc/openslx/udhcpc.openslx.script
@@ -20,9 +20,7 @@
 RESOLV_CONF="/etc/resolv.conf"
 IP_CONF="/tmp/udhcpc_ip_config"
 
-export PATH=$PATH:/openslx/sbin:/openslx/bin
-
-set >> /root/udhcpc_args
+export PATH=$PATH:/opt/openslx/sbin:/opt/openslx/bin
 
 case $1 in
     bound|renew)
@@ -45,6 +43,7 @@ case $1 in
 "
 	else
 		R="domain lp.ruf.uni-freiburg.de
+search lp.ruf.uni-freiburg.de
 "
 	fi	
 	count=1;
@@ -62,8 +61,10 @@ case $1 in
 	fi
 
 	# TODO i.e. event trigger
-	[ "x$(grep -ci debug /proc/cmdline)" == "x0" ] && systemctl start nfs-mount.service
-
+	[ "x$(grep -ci mount /proc/cmdline)" != "x0" ] && systemctl start nfs-mount.service
+	# Always mount virtlib directory
+	systemctl start var-lib-virt.mount
+	
 	;;
 
     deconfig)
diff --git a/remote/rootfs/rootfs-stage32/data/etc/profile b/remote/rootfs/rootfs-stage32/data/etc/profile
index ff29e9c5..a9b85a9c 100644
--- a/remote/rootfs/rootfs-stage32/data/etc/profile
+++ b/remote/rootfs/rootfs-stage32/data/etc/profile
@@ -5,10 +5,10 @@ export PATH=\
 /sbin:\
 /usr/bin:\
 /usr/sbin:\
-/openslx/bin:\
-/openslx/sbin:\
-/openslx/usr/bin:\
-/openslx/usr/sbin
+/opt/openslx/bin:\
+/opt/openslx/sbin:\
+/opt/openslx/usr/bin:\
+/opt/openslx/usr/sbin
 
 # If running interactively, then:
 if [ "$PS1" ]; then
diff --git a/remote/rootfs/rootfs-stage32/data/opt/openslx/bin/dhcp++ b/remote/rootfs/rootfs-stage32/data/opt/openslx/bin/dhcp++
new file mode 100755
index 00000000..256c6f49
--- /dev/null
+++ b/remote/rootfs/rootfs-stage32/data/opt/openslx/bin/dhcp++
@@ -0,0 +1,10 @@
+#!/bin/bash
+
+export PATH=$PATH:/opt/openslx/bin:/opt/openslx/sbin:/opt/openslx/usr/bin:/opt/openslx/usr/sbin
+
+NET_IF=$1
+NET_IP=$(ip addr show dev ${NET_IF} | grep "inet " | awk -F " " '{print $2}' | awk -F "/" '{print $1}')
+
+UDHCPC_OPTS=""
+[ ! -z "$NET_IP" ] && UDHCPC_OPTS=" -r $NET_IP "
+/opt/openslx/sbin/udhcpc $UDHCPC_OPTS -O domain -O nissrv -O nisdomain -O wpad -t 8 -s /etc/udhcpc.openslx.script -i $NET_IF
diff --git a/remote/rootfs/rootfs-stage32/data/opt/openslx/bin/mountexport b/remote/rootfs/rootfs-stage32/data/opt/openslx/bin/mountexport
new file mode 100755
index 00000000..64d5f485
--- /dev/null
+++ b/remote/rootfs/rootfs-stage32/data/opt/openslx/bin/mountexport
@@ -0,0 +1,17 @@
+#!/bin/bash
+
+export PATH=$PATH:/opt/openslx/usr/sbin:/opt/openslx/usr/bin:/opt/openslx/sbin:/opt/openslx/bin
+
+if grep "Ubuntu 13.04" "/etc/issue" >/dev/null; then
+	EXPORT="132.230.8.113:/srv/ubuntu1304"
+elif grep "SUSE" "/etc/issue" >/dev/null; then
+	EXPORT="132.230.8.113:/srv/suse"
+else
+	echo "Could not determine System"
+	exit 1
+fi
+
+echo "Mounting ${EXPORT} to /opt/openslx/mnt"
+mount -t nfs -o ro,async,nolock,vers=3 "$EXPORT" /opt/openslx/mnt || { echo "Fail." && exit 1; }
+echo "Appending /opt/openslx/mnt to /"
+mount -o remount,append:/opt/openslx/mnt=ro / || { echo "Fail." && exit 1; }
diff --git a/remote/rootfs/rootfs-stage32/data/usr/sbin/mountexport b/remote/rootfs/rootfs-stage32/data/usr/sbin/mountexport
deleted file mode 100755
index 61176364..00000000
--- a/remote/rootfs/rootfs-stage32/data/usr/sbin/mountexport
+++ /dev/null
@@ -1,17 +0,0 @@
-#!/bin/bash
-
-export PATH=$PATH:/openslx/usr/sbin:/openslx/usr/bin:/openslx/sbin:/openslx/bin
-
-if grep "Ubuntu" "/etc/issue" >/dev/null; then
-	EXPORT="132.230.8.113:/srv/ubuntu1304"
-elif grep "SUSE" "/etc/issue" >/dev/null; then
-	EXPORT="132.230.8.113:/srv/suse"
-else
-	echo "Could not determine System"
-	exit 1
-fi
-
-echo "Mounting ${EXPORT} to /openslx/mnt"
-mount -t nfs -o ro,async,nolock,vers=3 "$EXPORT" /openslx/mnt || { echo "Fail." && exit 1; }
-echo "Appending /openslx/mnt to /"
-mount -o remount,append:/openslx/mnt=ro / || { echo "Fail." && exit 1; }
diff --git a/remote/rootfs/rootfs-stage32/rootfs-stage32.build b/remote/rootfs/rootfs-stage32/rootfs-stage32.build
index 164a3464..7d639450 100644
--- a/remote/rootfs/rootfs-stage32/rootfs-stage32.build
+++ b/remote/rootfs/rootfs-stage32/rootfs-stage32.build
@@ -54,16 +54,23 @@ build() {
 }
 
 post_copy() {
+	# symlink for more
+	[ ! -e "$TARGET_BUILD_DIR/bin/more" ] && ln -s /usr/bin/more "$TARGET_BUILD_DIR/bin/more"
+	# same hack for mount
+	[ ! -e "$TARGET_BUILD_DIR/bin/mount" ] && ln -s /usr/bin/mount "$TARGET_BUILD_DIR/bin/mount"
 	
 	# make basic directory structure
-	mkdir -p "${TARGET_BUILD_DIR}"/{bin,dev,proc,lib,etc,mnt,sys,var/run,var/lock,var/log,run/lock,run/shm,openslx/mnt}
+	mkdir -p "${TARGET_BUILD_DIR}"/{bin,dev,proc,lib,etc,mnt,sys,var/run,var/lock,var/log,run/lock,run/shm,opt/openslx/mnt}
+
+	# make openslx log directory
+	mkdir -p "${TARGET_BUILD_DIR}"/var/log/openslx
 
 	# copy devices from running system
 	cp -a /dev/{console,kmsg,mem,null,shm,tty,tty0,tty1,tty9,fb0,urandom,zero} \
 		"${TARGET_BUILD_DIR}"/dev || perror "Copying devices from running system failed."
 
-	# set /etc/environment to include /openslx/bin and /openslx/sbin
-	echo "PATH=\"/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/openslx/sbin:/openslx/bin\"" \
+	# set /etc/environment to include /opt/openslx/bin and /opt/openslx/sbin
+	echo "PATH=\"/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/opt/openslx/sbin:/opt/openslx/bin\"" \
         	> "${TARGET_BUILD_DIR}/etc/environment"
 
 	# copy static files
diff --git a/remote/rootfs/rootfs-stage32/rootfs-stage32.conf b/remote/rootfs/rootfs-stage32/rootfs-stage32.conf
index 90faa567..a34634ab 100644
--- a/remote/rootfs/rootfs-stage32/rootfs-stage32.conf
+++ b/remote/rootfs/rootfs-stage32/rootfs-stage32.conf
@@ -25,7 +25,9 @@ REQUIRED_BINARIES="	bash
 			ssh
 			tput
 			xterm
-			ckbcomp"
+			ckbcomp
+			xvidtune
+			bc"
 REQUIRED_LIBRARIES="	libcap
 			libcidn
 			libcom_err
@@ -55,7 +57,8 @@ REQUIRED_FILES="	/etc/environment
 			/etc/networks
 			/etc/netconfig
 			/etc/modprobe.d/blacklist.conf
-			/etc/fonts/fonts.conf"
+			/etc/fonts/fonts.conf
+			/etc/X11/app-defaults/Xvidtune"
 REQUIRED_KERNEL_MODULES="	kernel/drivers/cpufreq
 				kernel/drivers/memstick
 				kernel/drivers/mfd
@@ -115,7 +118,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
diff --git a/remote/rootfs/rootfs-stage32/rootfs-stage32.conf.zypper b/remote/rootfs/rootfs-stage32/rootfs-stage32.conf.zypper
index 3fdfe499..8543a284 100644
--- a/remote/rootfs/rootfs-stage32/rootfs-stage32.conf.zypper
+++ b/remote/rootfs/rootfs-stage32/rootfs-stage32.conf.zypper
@@ -51,7 +51,6 @@ REQUIRED_FILES="	/etc/environment
 			/etc/inputrc
 			/etc/localtime
 			/etc/login.defs
-			/etc/nsswitch.conf
 			/etc/securetty
 			/etc/protocols
 			/etc/services