From 061c50264ce019265fef3933d53a42a923847bd8 Mon Sep 17 00:00:00 2001
From: Oliver Tappe
Date: Fri, 3 Aug 2007 19:57:52 +0000
Subject: * finished support for installation of Debian & Ubuntu. Things seem
 to be   working more or less fine now. Some systems I have tested do not boot
   into the graphical environment automatically, but that may be a problem  
 in stage3 (as manually invoking gdm works).

git-svn-id: http://svn.openslx.org/svn/openslx/trunk@1313 95ad53e4-c205-0410-b2fa-d234c58c8868
---
 installer/OpenSLX/OSSetup/Distro/Debian_3_1.pm | 35 ++++++++++++++++++++++++++
 1 file changed, 35 insertions(+)

(limited to 'installer/OpenSLX/OSSetup/Distro/Debian_3_1.pm')

diff --git a/installer/OpenSLX/OSSetup/Distro/Debian_3_1.pm b/installer/OpenSLX/OSSetup/Distro/Debian_3_1.pm
index 6fd4c74e..59e18820 100644
--- a/installer/OpenSLX/OSSetup/Distro/Debian_3_1.pm
+++ b/installer/OpenSLX/OSSetup/Distro/Debian_3_1.pm
@@ -19,6 +19,7 @@ use warnings;
 use base qw(OpenSLX::OSSetup::Distro::Debian);
 
 use OpenSLX::Basics;
+use OpenSLX::Utils;
 
 ################################################################################
 ### implementation
@@ -64,9 +65,43 @@ sub initDistroInfo
 			kernel-image-2.6-386
 			locales
 		",
+
+		'gnome' => "
+			<<<default>>>
+			gnome
+		",
+
+		'kde' => "
+			<<<default>>>
+			kde
+		",
+
 	};
 
 	return;
 }
 
+sub preSystemInstallationHook
+{
+	my $self = shift;
+	
+	$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.
+	rename('/usr/sbin/mkinitrd', '/usr/sbin/_mkinitrd');
+	spitFile('/usr/sbin/mkinitrd', "#! /bin/sh\ntouch \$2\n");
+	chmod 0755, '/usr/sbin/mkinitrd';
+}
+
+sub postSystemInstallationHook
+{
+	my $self = shift;
+
+	# restore /usr/sbin/mkinitrd
+	rename('/usr/sbin/_mkinitrd', '/usr/sbin/mkinitrd');
+	$self->SUPER::postSystemInstallationHook();
+}
+
 1;
\ No newline at end of file
-- 
cgit v1.2.3-55-g7522