summaryrefslogtreecommitdiffstats
path: root/src/boot-env/OpenSLX/MakeInitRamFS/Engine/SlxBoot.pm
diff options
context:
space:
mode:
authorDirk2012-12-15 00:57:08 +0100
committerDirk2012-12-15 00:57:08 +0100
commit47e090aeb770bb53e7bd42d4742cf5b85ad54080 (patch)
tree23deaab88599bd2b55141f313b6ff05144956f14 /src/boot-env/OpenSLX/MakeInitRamFS/Engine/SlxBoot.pm
parent... (diff)
parentFW is now automatically added to the initramfs. Checks are done with modinfo. (diff)
downloadcore-47e090aeb770bb53e7bd42d4742cf5b85ad54080.tar.gz
core-47e090aeb770bb53e7bd42d4742cf5b85ad54080.tar.xz
core-47e090aeb770bb53e7bd42d4742cf5b85ad54080.zip
Merge branch 'master' of git.openslx.org:openslx/core
Diffstat (limited to 'src/boot-env/OpenSLX/MakeInitRamFS/Engine/SlxBoot.pm')
-rw-r--r--src/boot-env/OpenSLX/MakeInitRamFS/Engine/SlxBoot.pm6
1 files changed, 4 insertions, 2 deletions
diff --git a/src/boot-env/OpenSLX/MakeInitRamFS/Engine/SlxBoot.pm b/src/boot-env/OpenSLX/MakeInitRamFS/Engine/SlxBoot.pm
index a0c24edb..23448998 100644
--- a/src/boot-env/OpenSLX/MakeInitRamFS/Engine/SlxBoot.pm
+++ b/src/boot-env/OpenSLX/MakeInitRamFS/Engine/SlxBoot.pm
@@ -52,6 +52,8 @@ sub _collectCMDs
$self->{distro}->applyChanges($self);
$self->_copyKernelModules();
+
+ $self->_copyModprobeD();
$self->_createInitRamFS();
@@ -235,9 +237,9 @@ sub _copyPreAndPostinitFiles
foreach my $cfg (
'default/initramfs/preinit.local',
- "$self->{'system-name'}/initramfs/preinit.local",
+ "$self->{'system-name'}/default/initramfs/preinit.local",
'default/initramfs/postinit.local',
- "$self->{'system-name'}/initramfs/postinit.local"
+ "$self->{'system-name'}/default/initramfs/postinit.local"
) {
my $cfgPath = "$openslxConfig{'private-path'}/config/stage3/$cfg";
next if !-f $cfgPath;