diff options
author | Jonathan Bauer | 2013-02-20 16:11:39 +0100 |
---|---|---|
committer | Jonathan Bauer | 2013-02-20 16:11:39 +0100 |
commit | a244fb16cd1011606f27ecf48e158ddbbb71df3a (patch) | |
tree | 4aa766564e0c2daaed9c74a8b750a3059504bbe1 /data | |
parent | renaming (diff) | |
parent | Most probably broken init ... (diff) | |
download | tm-scripts-a244fb16cd1011606f27ecf48e158ddbbb71df3a.tar.gz tm-scripts-a244fb16cd1011606f27ecf48e158ddbbb71df3a.tar.xz tm-scripts-a244fb16cd1011606f27ecf48e158ddbbb71df3a.zip |
merge conflict
Diffstat (limited to 'data')
-rwxr-xr-x | data/stage3.1/init | 39 |
1 files changed, 39 insertions, 0 deletions
diff --git a/data/stage3.1/init b/data/stage3.1/init index 0db7597e..affae622 100755 --- a/data/stage3.1/init +++ b/data/stage3.1/init @@ -20,6 +20,41 @@ 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 +# read primary graphic adaptor configuration (without proprietary drivers yet) +( hwinfo --gfxcard >/etc/hwinfo.gfxcard + case $(cat /etc/hwinfo.gfxcard) 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.netcard-usbctrl | 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 +sh /etc/modprobe.base; mdev -s # read kernel command line for debugging switch read KCL < /proc/cmdline @@ -78,6 +113,10 @@ for MOD in aufs squashfs sunrpc lockd fscache auth_rpcgss nfs_acl nfs; do insmod /lib/modules/${MOD}.ko done +# load basic filesystem modules +#modprobe -qa aufs squashfs nfs + + mkdir -p /dev/shm/union /dev/shm/uniontmp /rorootfs mount -n /mnt/openslx.sqfs /rorootfs mount -n -t tmpfs none /dev/shm/uniontmp |