diff options
| author | Thierry Vignaud <tv@mageia.org> | 2012-05-23 18:26:29 +0000 |
|---|---|---|
| committer | Thierry Vignaud <tv@mageia.org> | 2012-05-23 18:26:29 +0000 |
| commit | cfc6b7bb6074be9c5dfc4d7cf684601c7d4e5b2a (patch) | |
| tree | f4065885865f480d1f9009b74413b1e30244a8e0 | |
| parent | c14ef7280b4152702dadafbf36a61d199eee59ce (diff) | |
| download | drakx-cfc6b7bb6074be9c5dfc4d7cf684601c7d4e5b2a.tar drakx-cfc6b7bb6074be9c5dfc4d7cf684601c7d4e5b2a.tar.gz drakx-cfc6b7bb6074be9c5dfc4d7cf684601c7d4e5b2a.tar.bz2 drakx-cfc6b7bb6074be9c5dfc4d7cf684601c7d4e5b2a.tar.xz drakx-cfc6b7bb6074be9c5dfc4d7cf684601c7d4e5b2a.zip | |
(init_local_install) split it out of main()
| -rw-r--r-- | perl-install/install/install2.pm | 19 |
1 files changed, 11 insertions, 8 deletions
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; |