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

1 files changed, 98 insertions, 7 deletions

diff --git a/data/stage3.1/init b/data/stage3.1/init
index 15b6c947..bc3ce113 100755
--- a/data/stage3.1/init
+++ b/data/stage3.1/init
@@ -20,28 +20,119 @@ 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
 
-#modprobe -a squashfs aufs 2>/dev/null
+# read primary graphic adaptor configuration (without proprietary drivers yet)
+hwinfo --gfxcard --netcard --usb-ctrl >/etc/hwinfo &
 
-insmod /lib/modules/aufs.ko
-insmod /lib/modules/squashfs.ko
+# load local file systems
+insmod /lib/modules.0/aufs.ko 
+insmod /lib/modules.0/squashfs.ko
 
 mkdir -p /dev/shm/union /dev/shm/uniontmp /rorootfs
 mount -n /mnt/openslx.sqfs /rorootfs
-
 mount -n -t tmpfs none /dev/shm/uniontmp
 
 mount -n -t aufs -o br:/dev/shm/uniontmp:/rorootfs=ro none /mnt
 mkdir -p /mnt/uniontmp
 mount -n --move /dev/shm/uniontmp /mnt/uniontmp
 
+ln -s /mnt/lib/modules /lib/
+
+while ps | grep -v grep | grep -q "  hwinfo" ; do usleep 10 ; done
+
+case $(cat /etc/hwinfo) in
+	*i915*)
+	 	modprobe -a i915 2>/dev/null
+		;;
+       *intel*|*Intel*)
+	        modprobe -a i810 i830 i915 2>/dev/null
+        	;;
+       *nvidia*|*NVidia*|*nouveau*)
+	        modprobe -q nouveau 2>/dev/null
+        	;;
+       *radeon*|*Radeon*)
+	         modprobe -q radeon 2>/dev/null
+        	;;
+       *mga*|*matrox*|*Matrox*)
+	        modprobe -q mga 2>/dev/null
+	        ;;
+       *)
+	        modprobe -qa r128 savage sis tdfx ttm via viafb
+        	;;
+esac
+( modprobe -a drm fbcon; mdev -s ) &
+
+# load required network and usb controller drivers, filter out wireless adaptors
+nwcardlist="forcedeth e1000e e1000 e100 tg3 via-rhine r8169 pcnet32"
+echo "modprobe -qa usbhid hid-bright" >/etc/modprobe.base
+grep modprobe /etc/hwinfo | grep -E "$nwcardlist|hcd" \
+  | grep -v ehci | sed 's/.* Cmd: "//;s/"//;s/modprobe/modprobe -qb/' \
+  | sort -u >>/etc/modprobe.base
+# virtio hack
+if [ $(grep -ic "virtio_pci" /etc/modprobe.base) -ge 1 ]; then
+  echo "modprobe -q virtio_net" >>/etc/modprobe.base
+fi
+/bin/sh /etc/modprobe.base; mdev -s
+
+# read kernel command line for debugging switch
+read KCL < /proc/cmdline
+export KCL
+for opts in ${KCL}; do
+	case ${opts} in
+		debug)
+			DEBUG=1;;
+		ip=*)
+			# process IP info
+			ipinfo=${opts#ip=};;
+	esac
+done
+
+# setup network
+nwif="eth0"
+# set up loopback networking
+[ $DEBUGLEVEL -eq 20 ] && echo "** starting ip config at $(sysup)"
+ip link set dev lo up 2>/dev/null
+ip addr add 127.0.0.1/8 dev lo 2>/dev/null
+ip link set dev $nwif up  2>/dev/null || error "$init_noeth"
+
+# 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\
+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
+else
+  noipyet="yes"
+fi
+
+
+if [ $DEBUG -ge 1 ]; then
+	echo "Starting debug shell, CTRL + D will start Stage 3.2."
+	setsid sh -c 'exec sh </dev/tty1 >/dev/tty1 2>&1'
+fi
 
 for mnt in proc sys run ; do
-  #mount -n --move $mnt /mnt/$mnt
   umount -n $mnt
 done
 
-#/bin/sh
 unset BOOT_IMAGE initrd
 # new style of pivoting (switch_root or run-init)
 exec /sbin/switch_root -c /dev/console /mnt /usr/lib/systemd/systemd
-setsid sh -c 'exec sh </dev/tty1 >/dev/tty1 2>&1'