From cfc6b7bb6074be9c5dfc4d7cf684601c7d4e5b2a Mon Sep 17 00:00:00 2001
From: Thierry Vignaud <tv@mageia.org>
Date: Wed, 23 May 2012 18:26:29 +0000
Subject: (init_local_install) split it out of main()

---
 perl-install/install/install2.pm | 19 +++++++++++--------
 1 file changed, 11 insertions(+), 8 deletions(-)

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

diff --git a/perl-install/install/install2.pm b/perl-install/install/install2.pm
index 99a122e03..6f552dc2e 100644
--- a/perl-install/install/install2.pm
+++ b/perl-install/install/install2.pm
@@ -317,6 +317,16 @@ sub stop_udev() {
     fs::mount::umount($_) foreach '/dev/pts', '/dev/shm', '/run';
 }
 
+sub init_local_install {
+    my ($o) = @_;
+    push @::auto_steps, 
+#      'selectLanguage', 'selectKeyboard', 'miscellaneous', 'selectInstallClass',
+      'doPartitionDisks', 'formatPartitions';
+	fs::mount::usbfs(''); #- do it now so that when_load doesn't do it
+	$o->{nomouseprobe} = 1;
+	$o->{mouse} = mouse::fullname2mouse('Universal|Any PS/2 & USB mice');
+}
+
 #-######################################################################################
 #- MAIN
 #-######################################################################################
@@ -426,14 +436,7 @@ sub main {
 
     start_udev() if !$::local_install;
 
-    if ($::local_install) {
-	push @::auto_steps, 
-#	  'selectLanguage', 'selectKeyboard', 'miscellaneous', 'selectInstallClass',
-	  'doPartitionDisks', 'formatPartitions';
-	fs::mount::usbfs(''); #- do it now so that when_load doesn't do it
-	$o->{nomouseprobe} = 1;
-	$o->{mouse} = mouse::fullname2mouse('Universal|Any PS/2 & USB mice');
-    }
+    init_local_install($o) if $::local_install;
 
     $o->{prefix} = $::prefix = $::testing ? "/tmp/test-perl-install" : "/mnt";
     mkdir $::prefix, 0755;
-- 
cgit v1.2.1