From 5b2fefd682a1eaa4cfc7e6b44a1c846684c180ab Mon Sep 17 00:00:00 2001
From: Simon Rettberg
Date: Mon, 6 May 2013 11:40:40 +0200
Subject: Make mounting squashfs smarter; fix module loading logging Fixes to
 rsyslogd module buildscript

---
 remote/rootfs/rootfs-stage31/data/init | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'remote/rootfs')

diff --git a/remote/rootfs/rootfs-stage31/data/init b/remote/rootfs/rootfs-stage31/data/init
index 1e41012e..db3f4be7 100755
--- a/remote/rootfs/rootfs-stage31/data/init
+++ b/remote/rootfs/rootfs-stage31/data/init
@@ -29,8 +29,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"
-	modprobe "$DRM"
+	echo "Trying to load module $DRM" >> /mnt/modprobing
+	modprobe "$DRM" > /mnt/modprobing 2>> /mnt/modprobing
 done
 
 # read kernel command line for debugging switch
@@ -111,7 +111,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/$(ls /mnt/*.sqfs) /rorootfs || { echo "Problem mounting Squashfs. Dropping to DEBUG shell."; DEBUG=1; }
 fi
 			
 if [ $DEBUG -ge 1 ]; then
-- 
cgit v1.2.3-55-g7522