summaryrefslogtreecommitdiffstats
path: root/src/boot-env
diff options
context:
space:
mode:
authorMichael Janczyk2012-12-04 18:32:15 +0100
committerMichael Janczyk2012-12-04 18:32:15 +0100
commit77ff585ab48626ade2d312102ae98202bf8b8d98 (patch)
tree28511182974acfdcb2f47eb02756f0b180b6189e /src/boot-env
parentiPXE fixes (diff)
downloadcore-77ff585ab48626ade2d312102ae98202bf8b8d98.tar.gz
core-77ff585ab48626ade2d312102ae98202bf8b8d98.tar.xz
core-77ff585ab48626ade2d312102ae98202bf8b8d98.zip
- respect blacklisting of modules when autoloading modules in hwautocfg '-b' (stage3).
- preinit.local enabled again for config/systemName/default, until now it was only possible for the default system in config/default. It make no sense for client specific configurations though.
Diffstat (limited to 'src/boot-env')
-rw-r--r--src/boot-env/OpenSLX/MakeInitRamFS/Engine/SlxBoot.pm4
1 files changed, 2 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..cc5cc409 100644
--- a/src/boot-env/OpenSLX/MakeInitRamFS/Engine/SlxBoot.pm
+++ b/src/boot-env/OpenSLX/MakeInitRamFS/Engine/SlxBoot.pm
@@ -235,9 +235,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;