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

2 files changed, 33 insertions, 47 deletions

diff --git a/remote/rootfs/rootfs-stage31/data/init b/remote/rootfs/rootfs-stage31/data/init
index a9c0435c..1e41012e 100755
--- a/remote/rootfs/rootfs-stage31/data/init
+++ b/remote/rootfs/rootfs-stage31/data/init
@@ -25,6 +25,14 @@ mount -n -t tmpfs -o 'mode=755' run "/run"
 echo "/sbin/mdev" > /proc/sys/kernel/hotplug
 # read graphic and network adaptor configuration (without proprietary drivers yet)
 
+# TODO: must ugly hack ever... needs to be improved when we add prop drivers
+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"
+done
+
 # read kernel command line for debugging switch
 DEBUG=0
 read KCL < /proc/cmdline
@@ -57,10 +65,6 @@ if [ "x$SPLASH" == "x1" -a "x$DEBUG" != "x1" ]; then
 	plymouthd && plymouth show-splash
 fi
 
-# still needed?
-#echo "modprobe -qa usbhid hid-bright" >/etc/modprobe.base
-#/bin/sh /etc/modprobe.base; mdev -s
-
 # setup network
 nwif="eth0"
 # set up loopback networking
@@ -73,37 +77,32 @@ ip link set dev $nwif up  2>/dev/null || { echo "No link for $nwif, dropping to
 # analyze ip information from the kernel command line and put parts
 # of it into several variables
 if [ -n "$ipinfo" ] ; then
-  getip () {
-    local val="$ipinfo:"; i=$(($1 - 1));
-    while [ $i -gt 0 ] ; do
-      val=${val#*:} ; i=$(($i - 1));
-    done;
-  echo $val|sed "s/:.*//"; }
-  clientip=$(getip 1)
-  serverip=$(getip 2)
-  gateway=$(getip 3)
-  subnet_mask=$(getip 4)
-  broadcast_address=$(ipcalc -s -b $clientip $subnet_mask|sed s/.*=//)
-  [ -z "$broadcast_address" ] && broadcast_address=255.255.255.255
-  # we might have an idea of the dns server via preboot
-  dns_srv=$(getip 5)
-  [ -n "$dns_srv" ] && echo nameserver $dns_srv >/etc/resolv.conf;
-  echo -e "# ip configuration written by $0 script:\nclientip=$clientip\n\
+	getip () {
+	local val="$ipinfo:"; i=$(($1 - 1));
+	while [ $i -gt 0 ] ; do
+		val=${val#*:} ; i=$(($i - 1));
+	done;
+	echo $val|sed "s/:.*//"; }
+	clientip=$(getip 1)
+	serverip=$(getip 2)
+	gateway=$(getip 3)
+	subnet_mask=$(getip 4)
+	broadcast_address=$(ipcalc -s -b $clientip $subnet_mask|sed s/.*=//)
+	[ -z "$broadcast_address" ] && broadcast_address=255.255.255.255
+	# we might have an idea of the dns server via preboot
+	dns_srv=$(getip 5)
+	[ -n "$dns_srv" ] && echo nameserver $dns_srv >/etc/resolv.conf;
+	echo -e "# ip configuration written by $0 script:\nclientip=$clientip\n\
 subnet_mask=$subnet_mask\ngateway=$gateway\nserverip=$serverip\n\
 broadcast_address=$broadcast_address" >>/etc/initramfs-setup
-  # set static ip address
-  ip addr add $clientip/$(ipcalc -s -p $clientip $subnet_mask|sed s/.*=//) \
-    broadcast $broadcast_address dev $nwif 2>/dev/null
-  ip route add default via $gateway 2>/dev/null
+	# set static ip address
+	ip addr add $clientip/$(ipcalc -s -p $clientip $subnet_mask|sed s/.*=//) \
+	broadcast $broadcast_address dev $nwif 2>/dev/null
+	ip route add default via $gateway 2>/dev/null
 else
-  noipyet="yes"
+	noipyet="yes"
 fi
 
-
-# load local file systems - in kernel now! :-)
-#modprobe aufs
-#modprobe squashfs
-
 mkdir -p /dev/shm/union /dev/shm/uniontmp /rorootfs
 mount -n -t tmpfs none /dev/shm/uniontmp
 
@@ -124,12 +123,13 @@ else
 fi
 
 echo "Building aufs..."
+#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
-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"
+[ -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"
 
 for mnt in proc sys run ; do
   umount -n $mnt
diff --git a/remote/rootfs/rootfs-stage31/rootfs-stage31.conf b/remote/rootfs/rootfs-stage31/rootfs-stage31.conf
index 788ff8b3..b39895e2 100644
--- a/remote/rootfs/rootfs-stage31/rootfs-stage31.conf
+++ b/remote/rootfs/rootfs-stage31/rootfs-stage31.conf
@@ -4,22 +4,8 @@ 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/gpu/drm/ttm/ttm.ko
-        	               	kernel/drivers/gpu/drm/via/via.ko
-                	       	kernel/drivers/gpu/drm/drm.ko
-                       	       	kernel/drivers/gpu/drm/tdfx/tdfx.ko
-	                       	kernel/drivers/gpu/drm/nouveau/nouveau.ko
-	                       	kernel/drivers/gpu/drm/savage/savage.ko
-				kernel/drivers/gpu/drm/radeon/radeon.ko
-				kernel/drivers/gpu/drm/drm_kms_helper.ko
-				kernel/drivers/gpu/drm/i810/i810.ko
-				kernel/drivers/gpu/drm/i2c/ch7006.ko
-				kernel/drivers/gpu/drm/i2c/sil164.ko
-				kernel/drivers/gpu/drm/sis/sis.ko
-				kernel/drivers/gpu/drm/mga/mga.ko
-				kernel/drivers/gpu/drm/i915/i915.ko
-				kernel/drivers/gpu/drm/r128/r128.ko
-				kernel/drivers/gpu/drm/vmwgfx/vmwgfx.ko
+	                       	kernel/drivers/gpu/drm/drm*.ko
+	                       	kernel/drivers/gpu/drm/*/*.ko
 				kernel/drivers/i2c/algos/i2c-algo-bit.ko
 				kernel/drivers/i2c/i2c-core.ko
 				kernel/drivers/usb/usb-common.ko