diff options
| author | Jonathan Bauer | 2013-02-20 19:06:00 +0100 |
|---|---|---|
| committer | Jonathan Bauer | 2013-02-20 19:06:00 +0100 |
| commit | cf449909c686b561ebd3fdfdb2ab0e0618911d8e (patch) | |
| tree | 3d857088e200d5419a9fc189d51eb2f5badf095d | |
| parent | init auto hw config (diff) | |
| download | tm-scripts-cf449909c686b561ebd3fdfdb2ab0e0618911d8e.tar.gz tm-scripts-cf449909c686b561ebd3fdfdb2ab0e0618911d8e.tar.xz tm-scripts-cf449909c686b561ebd3fdfdb2ab0e0618911d8e.zip | |
init: fix network config at startup
| -rwxr-xr-x | data/stage3.1/init | 20 |
1 files changed, 14 insertions, 6 deletions
diff --git a/data/stage3.1/init b/data/stage3.1/init index bc3ce113..c51abbea 100755 --- a/data/stage3.1/init +++ b/data/stage3.1/init @@ -21,7 +21,7 @@ mount -n -t tmpfs -o 'mode=755' run "/run" [ ! -d /sys/class ] && mount -n -t sysfs sysfs /sys # read primary graphic adaptor configuration (without proprietary drivers yet) -hwinfo --gfxcard --netcard --usb-ctrl >/etc/hwinfo & +( hwinfo --gfxcard --usb-ctrl > /etc/hwinfo ) & # load local file systems insmod /lib/modules.0/aufs.ko @@ -32,12 +32,16 @@ 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 +mkdir -p /mnt/uniontmp /mnt/tmp 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 +cat /proc/uptime >/mnt/tmp/runtime + +( hwinfo --netcard > /etc/netcard ) & +while ps | grep -v grep | grep -q " hwinfo --gfxcard" ; do usleep 10 ; done + case $(cat /etc/hwinfo) in *i915*) @@ -55,6 +59,8 @@ case $(cat /etc/hwinfo) in *mga*|*matrox*|*Matrox*) modprobe -q mga 2>/dev/null ;; + *VMWARE*) + ;; *) modprobe -qa r128 savage sis tdfx ttm via viafb ;; @@ -62,10 +68,11 @@ 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" +while ps | grep -v grep | grep -q " hwinfo --netcard" ; do usleep 10 ; done +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/' \ +grep modprobe /etc/netcard | grep -E "$nwcardlist" \ + | 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 @@ -123,6 +130,7 @@ else noipyet="yes" fi +cat /proc/uptime >>/mnt/tmp/runtime if [ $DEBUG -ge 1 ]; then echo "Starting debug shell, CTRL + D will start Stage 3.2." |