summaryrefslogtreecommitdiffstats
path: root/installer
diff options
context:
space:
mode:
Diffstat (limited to 'installer')
-rw-r--r--installer/OpenSLX/OSSetup/Distro/Debian_3_1.pm11
-rw-r--r--installer/OpenSLX/OSSetup/Engine.pm2
2 files changed, 9 insertions, 4 deletions
diff --git a/installer/OpenSLX/OSSetup/Distro/Debian_3_1.pm b/installer/OpenSLX/OSSetup/Distro/Debian_3_1.pm
index 24ca7ef5..438ffd6b 100644
--- a/installer/OpenSLX/OSSetup/Distro/Debian_3_1.pm
+++ b/installer/OpenSLX/OSSetup/Distro/Debian_3_1.pm
@@ -30,9 +30,14 @@ sub preSystemInstallationHook
$self->SUPER::preSystemInstallationHook();
- # replace /usr/sbin/mkinitrd with a dummy, in order to skip the hopeless
- # pass at trying to create an initrd. It doesn't work and we don't need
- # it either.
+ # when the kernel package is being configured, it insists on trying to
+ # create an initrd, which neither works nor makes sense in our environment.
+ #
+ # in order to circumvent this problem, we manually install initrd-tools
+ # (which contains mkinitrd) ...
+ slxsystem("apt-get install initrd-tools");
+ # ... and replace /usr/sbin/mkinitrd with a dummy, in order to skip the
+ # initrd-creation.
rename('/usr/sbin/mkinitrd', '/usr/sbin/_mkinitrd');
spitFile('/usr/sbin/mkinitrd', "#! /bin/sh\ntouch \$2\n");
chmod 0755, '/usr/sbin/mkinitrd';
diff --git a/installer/OpenSLX/OSSetup/Engine.pm b/installer/OpenSLX/OSSetup/Engine.pm
index 9fff64cf..8424b831 100644
--- a/installer/OpenSLX/OSSetup/Engine.pm
+++ b/installer/OpenSLX/OSSetup/Engine.pm
@@ -1399,9 +1399,9 @@ sub _setupStage1D
$self->_callChrootedFunction({
chrootDir => $self->{'vendor-os-path'},
function => sub {
- $self->{distro}->preSystemInstallationHook();
$self->_stage1D_setupPackageSources();
$self->_stage1D_updateBasicVendorOS();
+ $self->{distro}->preSystemInstallationHook();
$self->_stage1D_installPackageSelection();
$self->{distro}->postSystemInstallationHook();
},