summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Janczyk2012-12-12 19:02:04 +0100
committerMichael Janczyk2012-12-12 19:02:04 +0100
commit00aca01bbf2daf8cdd63c3846ca29e3dc50185e5 (patch)
tree253f473c9a9bbe457c7776867967b6989bcfb649
parentminor sysrq changes, nohup is needed to log out from ssh session before halt ... (diff)
downloadcore-00aca01bbf2daf8cdd63c3846ca29e3dc50185e5.tar.gz
core-00aca01bbf2daf8cdd63c3846ca29e3dc50185e5.tar.xz
core-00aca01bbf2daf8cdd63c3846ca29e3dc50185e5.zip
Respect aliases and blacklist of a system. /etc/modprobe.d is now copied to InitRamFS
-rw-r--r--src/boot-env/OpenSLX/MakeInitRamFS/Engine/Base.pm11
-rw-r--r--src/boot-env/OpenSLX/MakeInitRamFS/Engine/Preboot.pm2
-rw-r--r--src/boot-env/OpenSLX/MakeInitRamFS/Engine/SlxBoot.pm2
3 files changed, 15 insertions, 0 deletions
diff --git a/src/boot-env/OpenSLX/MakeInitRamFS/Engine/Base.pm b/src/boot-env/OpenSLX/MakeInitRamFS/Engine/Base.pm
index e23dc40f..bf96daf6 100644
--- a/src/boot-env/OpenSLX/MakeInitRamFS/Engine/Base.pm
+++ b/src/boot-env/OpenSLX/MakeInitRamFS/Engine/Base.pm
@@ -336,6 +336,17 @@ sub _copyKernelModules
return;
}
+sub _copyModprobeD
+{
+ my $self = shift;
+
+ my $source = "$self->{'root-path'}/etc/modprobe.d";
+ my $target = "$self->{'build-path'}/etc";
+ $self->addCMD("cp -pr --dereference $source $target");
+
+ return;
+}
+
sub _platformSpecificFileFor
{
my $self = shift;
diff --git a/src/boot-env/OpenSLX/MakeInitRamFS/Engine/Preboot.pm b/src/boot-env/OpenSLX/MakeInitRamFS/Engine/Preboot.pm
index 319ff65e..e0123aa7 100644
--- a/src/boot-env/OpenSLX/MakeInitRamFS/Engine/Preboot.pm
+++ b/src/boot-env/OpenSLX/MakeInitRamFS/Engine/Preboot.pm
@@ -43,6 +43,8 @@ sub _collectCMDs
$self->_copyKernelModules();
+ $self->_copyModprobeD();
+
$self->_createInitRamFS();
return;
diff --git a/src/boot-env/OpenSLX/MakeInitRamFS/Engine/SlxBoot.pm b/src/boot-env/OpenSLX/MakeInitRamFS/Engine/SlxBoot.pm
index cc5cc409..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();