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

8 files changed, 17 insertions, 18 deletions

diff --git a/remote/modules/busybox/busybox.build b/remote/modules/busybox/busybox.build
index e93eeb81..adb3db86 100644
--- a/remote/modules/busybox/busybox.build
+++ b/remote/modules/busybox/busybox.build
@@ -1,4 +1,3 @@
-#!/bin/bash
 
 fetch_source() {
 	git clone "${REQUIRED_GIT}" src || perror "Could not clone busybox git"
@@ -13,7 +12,8 @@ build() {
 	pinfo "Running make (if this hangs, check for unset options, ie. when you increased the REQUIRED_BRANCH)"
 	make || perror "failed."
 	pinfo "Running make install"
-	make CONFIG_PREFIX="$MODULE_DIR/build" install || perror "failed"
+	make CONFIG_PREFIX="$MODULE_BUILD_DIR" install || perror "failed"
+	rm "$MODULE_BUILD_DIR/bin/mount" "$MODULE_BUILD_DIR/bin/umount" "$MODULE_BUILD_DIR/bin/bash"
 	cd - &> /dev/null
 }
 
diff --git a/remote/modules/busybox/openslx-busybox-config b/remote/modules/busybox/openslx-busybox-config
index 0f508f47..ae9f9ede 100644
--- a/remote/modules/busybox/openslx-busybox-config
+++ b/remote/modules/busybox/openslx-busybox-config
@@ -642,7 +642,7 @@ CONFIG_FEATURE_VOLUMEID_LINUXRAID=y
 # Miscellaneous Utilities
 #
 # CONFIG_CONSPY is not set
-CONFIG_LESS=y
+# CONFIG_LESS is not set
 CONFIG_FEATURE_LESS_MAXLINES=9999999
 CONFIG_FEATURE_LESS_BRACKETS=y
 CONFIG_FEATURE_LESS_FLAGS=y
diff --git a/remote/rootfs/rootfs-stage31/data/bin/activate_sysconfig b/remote/rootfs/rootfs-stage31/data/bin/activate_sysconfig
index 3e78383e..bc7dfd71 100755
--- a/remote/rootfs/rootfs-stage31/data/bin/activate_sysconfig
+++ b/remote/rootfs/rootfs-stage31/data/bin/activate_sysconfig
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/bin/ash
 
 echo "Configuring stage 3.2 ..."
 
diff --git a/remote/rootfs/rootfs-stage31/data/bin/setup_network b/remote/rootfs/rootfs-stage31/data/bin/setup_network
index b504a92b..06b46200 100755
--- a/remote/rootfs/rootfs-stage31/data/bin/setup_network
+++ b/remote/rootfs/rootfs-stage31/data/bin/setup_network
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/ash
 
 echo "Setting up network..."
 
diff --git a/remote/rootfs/rootfs-stage31/data/bin/setup_stage32 b/remote/rootfs/rootfs-stage31/data/bin/setup_stage32
index ba09b663..4e19fb3a 100755
--- a/remote/rootfs/rootfs-stage31/data/bin/setup_stage32
+++ b/remote/rootfs/rootfs-stage31/data/bin/setup_stage32
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/bin/ash
 #
 #	This script sets up the stage 3.2.
 #		- downloads/mounts stage32.sqfs
@@ -12,7 +12,7 @@
 #
 if [ -n "$NFS" ]; then
 	echo "Mounting stage 3.2 as NFS..."
-	mount -t nfs -o ro,async,nolock ${NFSSERVER}:${NFSPATH} /rorootfs \
+	busybox mount -n -t nfs -o ro,async,nolock ${NFSSERVER}:${NFSPATH} /rorootfs \
 		|| drop_shell "Problem mounting NFS-Directory from ${NFSSERVER}:${NFSPATH}." \
 		|| return 1
 	return 0
@@ -35,12 +35,12 @@ download "${SLX_BASE_PATH}/stage32.sqfs" "$STAGE32_TARGET_PATH" || drop_shell "C
 
 # try to mount it at STAGE32_MOUNT_POINT
 echo "Mounting stage 3.2 as SquashFS..."
-mount -t squashfs "$STAGE32_TARGET_PATH" "$STAGE32_MOUNT_POINT" || drop_shell "Problem mounting Squashfs."
+busybox mount -n -t squashfs "$STAGE32_TARGET_PATH" "$STAGE32_MOUNT_POINT" || drop_shell "Problem mounting Squashfs."
 
 echo "Building aufs ..."
-mount -n -t aufs -o "br:${FUTURE_ROOT}:${STAGE32_MOUNT_POINT}=ro" none /mnt || drop_shell "Problem building aufs."
+busybox mount -n -t aufs -o "br:${FUTURE_ROOT}:${STAGE32_MOUNT_POINT}=ro" none /mnt || drop_shell "Problem building aufs."
 mkdir -p /mnt/opt/openslx/uniontmp /mnt/tmp
-mount -n --move "$FUTURE_ROOT" /mnt/opt/openslx/uniontmp || drop_shell "Problem moving uniontmp."
+busybox mount -n --move "$FUTURE_ROOT" /mnt/opt/openslx/uniontmp || drop_shell "Problem moving uniontmp."
 FUTURE_ROOT="/mnt"
 
 # "Delete" addon hook-script in aufs view
diff --git a/remote/rootfs/rootfs-stage31/data/init b/remote/rootfs/rootfs-stage31/data/init
index 0631d7c1..f8b3ebe0 100755
--- a/remote/rootfs/rootfs-stage31/data/init
+++ b/remote/rootfs/rootfs-stage31/data/init
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/ash
 # Copyright (c) 2012 - OpenSLX GmbH
 #
 # This program is free software distributed under the GPL version 2.
@@ -20,14 +20,14 @@ export LD_LIBRARY_PATH=/usr/lib64
 . /etc/functions.inc
 
 # mount the important standard directories
-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
+busybox mount -n -t tmpfs -o 'mode=755' run "/run"
+[ ! -f /proc/cpuinfo ] && busybox mount -n -t proc proc /proc
+[ ! -d /sys/class ] && busybox mount -n -t sysfs sysfs /sys
 
 # preparations for mounting stage3.2
 FUTURE_ROOT="/dev/shm/uniontmp"
 mkdir -p "$FUTURE_ROOT" /rorootfs
-mount -n -t tmpfs none "$FUTURE_ROOT"
+busybox mount -n -t tmpfs none "$FUTURE_ROOT"
 mkdir -p "$FUTURE_ROOT/opt/openslx"
 
 # let kernel know that mdev is to be used for hotplug
@@ -109,7 +109,7 @@ fi
 
 # unmount filesystems
 for mnt in proc sys run ; do
-  umount -n "$mnt"
+  busybox umount -n "$mnt"
 done
 
 echo "Switching root...."
diff --git a/remote/rootfs/rootfs-stage32/data/bin/sh b/remote/rootfs/rootfs-stage32/data/bin/sh
index f8c409b1..5d4150d0 120000
--- a/remote/rootfs/rootfs-stage32/data/bin/sh
+++ b/remote/rootfs/rootfs-stage32/data/bin/sh
@@ -1 +1 @@
-/opt/openslx/bin/ash
\ No newline at end of file
+/bin/bash
\ No newline at end of file
diff --git a/remote/rootfs/rootfs-stage32/rootfs-stage32.conf b/remote/rootfs/rootfs-stage32/rootfs-stage32.conf
index 6ec4a2cd..bf2ffabf 100644
--- a/remote/rootfs/rootfs-stage32/rootfs-stage32.conf
+++ b/remote/rootfs/rootfs-stage32/rootfs-stage32.conf
@@ -24,7 +24,6 @@ REQUIRED_BINARIES="
 	ssh
 	tput
 	xterm
-	xvidtune
 	bc
 	dirname
 	mkdosfs