diff options
| -rw-r--r-- | boot-env/OpenSLX/MakeInitRamFS/Engine/Base.pm | 4 | ||||
| -rwxr-xr-x | initramfs/stage3-stuff/init | 8 |
2 files changed, 12 insertions, 0 deletions
diff --git a/boot-env/OpenSLX/MakeInitRamFS/Engine/Base.pm b/boot-env/OpenSLX/MakeInitRamFS/Engine/Base.pm index a4a984e9..ca4764ca 100644 --- a/boot-env/OpenSLX/MakeInitRamFS/Engine/Base.pm +++ b/boot-env/OpenSLX/MakeInitRamFS/Engine/Base.pm @@ -240,6 +240,10 @@ sub _copyKernelModules push @kernelModules, split ' ', $self->{attrs}->{ramfs_miscmods}; push @kernelModules, split ' ', $self->{attrs}->{ramfs_nicmods}; + if ($self->{attrs}->{ramfs_nicmods} =~ m{virtio}i) { + push @kernelModules, qw( virtio_pci virtio_net ); + } + # a function that determines dependent modules recursively my $addDependentsSub; $addDependentsSub = sub { 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)" |