From cbd04b6bf2164ecd65fed3008a70e8c9fdc165fc Mon Sep 17 00:00:00 2001
From: Oliver Tappe
Date: Tue, 21 Aug 2007 17:47:48 +0000
Subject: * fixed problem reported by Dirk that caused debian-3.1  
 installations to fail during first try (but work when   retrying).

git-svn-id: http://svn.openslx.org/svn/openslx/trunk@1324 95ad53e4-c205-0410-b2fa-d234c58c8868
---
 installer/OpenSLX/OSSetup/Distro/Debian_3_1.pm | 11 ++++++++---
 installer/OpenSLX/OSSetup/Engine.pm            |  2 +-
 2 files changed, 9 insertions(+), 4 deletions(-)

(limited to 'installer')

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();
 		},
-- 
cgit v1.2.3-55-g7522