diff options
| author | Dirk von Suchodoletz | 2010-02-11 00:46:25 +0100 |
|---|---|---|
| committer | Dirk von Suchodoletz | 2010-02-11 00:46:25 +0100 |
| commit | 5acd1dfa75dbd26cf313f98bc32e2557616accf9 (patch) | |
| tree | 9de6a893ae976c31a51342e29348996433ab4cf2 /initramfs | |
| parent | Cleaning up the runlevel mess of vmware plugin ... Not finished yet. (diff) | |
| parent | add support for event config output (diff) | |
| download | core-5acd1dfa75dbd26cf313f98bc32e2557616accf9.tar.gz core-5acd1dfa75dbd26cf313f98bc32e2557616accf9.tar.xz core-5acd1dfa75dbd26cf313f98bc32e2557616accf9.zip | |
Merge branch 'master' of openslx.org:openslx/core
Diffstat (limited to 'initramfs')
| -rwxr-xr-x | initramfs/stage3-stuff/bin/hwautocfg | 4 | ||||
| -rwxr-xr-x | initramfs/stage3-stuff/init | 8 |
2 files changed, 12 insertions, 0 deletions
diff --git a/initramfs/stage3-stuff/bin/hwautocfg b/initramfs/stage3-stuff/bin/hwautocfg index 0bfbdd2c..9cd0f8a4 100755 --- a/initramfs/stage3-stuff/bin/hwautocfg +++ b/initramfs/stage3-stuff/bin/hwautocfg @@ -31,6 +31,10 @@ modprobe -a ${MODPRV} usbhid hid-bright 2>/dev/null & nwcardlist=$(echo ${slxconf_listnwmod}|sed "s/\ /|/g") hwinfo --netcard --usb-ctrl | grep modprobe | grep -E "$nwcardlist|hcd" | \ grep -v ehci | sed 's/.* Cmd: "//;s/"//' | sort -u >/etc/modprobe.base +# virtio hack +if [ $(grep -ic "virtio_pci" /etc/modprobe.base) -ge 1 ]; then + echo "modprobe virtio_net" >>/etc/modprobe.base +fi ash /etc/modprobe.base; mdev -s # optimization possible: exclude network and usb base drivers from the # following list (bios detection for non-hwautocfg component) diff --git a/initramfs/stage3-stuff/init b/initramfs/stage3-stuff/init index a96c66e0..b28f1138 100755 --- a/initramfs/stage3-stuff/init +++ b/initramfs/stage3-stuff/init @@ -379,6 +379,7 @@ else fi runinithook '10-nw-if-config' + # check for multiple ethernet interfaces (we have at least the mac of PXE boot # device in $bootmac) # check here for the active ethernet link (skip non-ethN interfaces) @@ -410,6 +411,7 @@ if strinstr "eth" "$nwif" ; then done fi # hook to setup bridging (several virtualization tools ...) + runinithook '20-nw-bridge-config' # set up loopback networking @@ -802,6 +804,11 @@ fi runinithook '50-have-layered-fs' +# logdir +. /mnt/etc/opt/openslx/openslx.conf +testmkd /mnt/${OPENSLX_DEFAULT_LOGDIR} +chmod -R 1777 /mnt/${OPENSLX_DEFAULT_LOGDIR} # testmkd 1777 seems not to work + # script for stuff to execute during early bootup d_mkrlscript init boot.slx "Running configuration postponed from InitRamFS" echo "fs complete at $(sysup)" >/tmp/fscmpl @@ -927,6 +934,7 @@ else fi runinithook '80-after-plugins' + # runtimer [ $DEBUGLEVEL -eq 8 -o $DEBUGLEVEL -eq 20 ] && \ echo "** Plugin configuration finished at $(sysup)" |