From c6bea4ae86c6843d9f32150a6cd29d24006cf105 Mon Sep 17 00:00:00 2001
From: Pascal Rigaux <pixel@mandriva.com>
Date: Mon, 30 May 2005 06:32:24 +0000
Subject: make drakx-in-chroot work

---
 perl-install/install2.pm | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

(limited to 'perl-install/install2.pm')

diff --git a/perl-install/install2.pm b/perl-install/install2.pm
index 9ee903de0..5f62b3ac1 100644
--- a/perl-install/install2.pm
+++ b/perl-install/install2.pm
@@ -294,7 +294,6 @@ sub addUser {
 #------------------------------------------------------------------------------
 sub setupBootloader {
     my ($_clicked, $ent_number, $auto) = @_;
-    return if $::local_install;
 
     $o->{modules_conf}->write;
 
@@ -341,6 +340,7 @@ sub start_i810fb() {
 #- MAIN
 #-######################################################################################
 sub main {
+#-    $SIG{__DIE__} = sub { warn "DIE " . backtrace() . "\n" };
     $SIG{SEGV} = sub { 
 	my $msg = "segmentation fault: seems like memory is missing as the install crashes"; log::l($msg);
 	$o->ask_warn('', $msg);
@@ -446,6 +446,12 @@ sub main {
         require move;
         move::init($o);
     }
+    if ($::local_install) {
+	push @auto, 
+	  'selectLanguage', 'selectKeyboard', 'miscellaneous', 
+	  'selectInstallClass', 'doPartitionDisks', 'formatPartitions', 'setupBootloader';
+	fs::mount_usbfs(''); #- do it now so that when_load doesn't do it
+    }
 
     cp_f(glob('/stage1/tmp/*'), '/tmp');
 
-- 
cgit v1.2.1