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

5 files changed, 10 insertions, 4 deletions

diff --git a/remote/rootfs/rootfs-stage31/data/init b/remote/rootfs/rootfs-stage31/data/init
index 2e679dad..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)
 
@@ -29,8 +30,8 @@ echo "/sbin/mdev" > /proc/sys/kernel/hotplug
 for DRM in /lib/modules/*/kernel/drivers/gpu/drm/*.ko /lib/modules/*/kernel/drivers/gpu/drm/*/*.ko; do
 	DRM="$(basename "$DRM")"
 	DRM="${DRM%.ko}"
-	echo "Trying to load module $DRM" >> /mnt/modprobing
-	modprobe "$DRM" >> /mnt/modprobing 2>> /mnt/modprobing
+	echo "Trying to load module $DRM"
+	modprobe "$DRM"
 done
 
 # read kernel command line for debugging switch
diff --git a/remote/rootfs/rootfs-stage32/data/etc/udhcpc.openslx.script b/remote/rootfs/rootfs-stage32/data/etc/udhcpc.openslx.script
index d8ecddef..eddf3bd1 100755
--- a/remote/rootfs/rootfs-stage32/data/etc/udhcpc.openslx.script
+++ b/remote/rootfs/rootfs-stage32/data/etc/udhcpc.openslx.script
@@ -61,7 +61,7 @@ search lp.ruf.uni-freiburg.de
 	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
 
 	;;
 
diff --git a/remote/rootfs/rootfs-stage32/data/opt/openslx/bin/dhcp++ b/remote/rootfs/rootfs-stage32/data/opt/openslx/bin/dhcp++
index 256c6f49..256c6f49 100644..100755
--- a/remote/rootfs/rootfs-stage32/data/opt/openslx/bin/dhcp++
+++ b/remote/rootfs/rootfs-stage32/data/opt/openslx/bin/dhcp++
diff --git a/remote/rootfs/rootfs-stage32/rootfs-stage32.build b/remote/rootfs/rootfs-stage32/rootfs-stage32.build
index 04b6c5b4..2e214c5d 100644
--- a/remote/rootfs/rootfs-stage32/rootfs-stage32.build
+++ b/remote/rootfs/rootfs-stage32/rootfs-stage32.build
@@ -54,6 +54,10 @@ 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,opt/openslx/mnt}
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