diff options
| author | Pascal Rigaux <pixel@mandriva.com> | 2001-02-23 21:35:04 +0000 |
|---|---|---|
| committer | Pascal Rigaux <pixel@mandriva.com> | 2001-02-23 21:35:04 +0000 |
| commit | 2812763c984bdfdbdfa63a6e79570555cddcee1c (patch) | |
| tree | 4b154fce1f406406672e13d0b8b8d79b1abbe97d | |
| parent | d14f47678e35baa77cac985444afca37a7ec85f4 (diff) | |
| download | drakx-backup-do-not-use-2812763c984bdfdbdfa63a6e79570555cddcee1c.tar drakx-backup-do-not-use-2812763c984bdfdbdfa63a6e79570555cddcee1c.tar.gz drakx-backup-do-not-use-2812763c984bdfdbdfa63a6e79570555cddcee1c.tar.bz2 drakx-backup-do-not-use-2812763c984bdfdbdfa63a6e79570555cddcee1c.tar.xz drakx-backup-do-not-use-2812763c984bdfdbdfa63a6e79570555cddcee1c.zip | |
(g_auto_install): handle $replay flag. It means a 'not fully automated install'.
| -rw-r--r-- | perl-install/install_any.pm | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/perl-install/install_any.pm b/perl-install/install_any.pm index 566a7b70c..7384384ef 100644 --- a/perl-install/install_any.pm +++ b/perl-install/install_any.pm @@ -516,7 +516,7 @@ sub kdemove_desktop_file { sub auto_inst_file() { ($::g_auto_install ? "/tmp" : "$::o->{prefix}/root") . "/auto_inst.cfg.pl" } sub g_auto_install { - my ($f) = @_; $f ||= auto_inst_file; + my ($f, $replay) = @_; $f ||= auto_inst_file; my $o = {}; require pkgs; @@ -536,8 +536,8 @@ sub g_auto_install { } } - local $o->{partitioning}{auto_allocate} = 1; - local $o->{autoExitInstall} = 1; + local $o->{partitioning}{auto_allocate} = !$replay; + local $o->{autoExitInstall} = $replay; #- deep copy because we're modifying it below $o->{users} = [ @{$o->{users} || []} ]; @@ -547,7 +547,11 @@ sub g_auto_install { require Data::Dumper; output($f, "# You should always check the syntax with 'perl -cw auto_inst.cfg.pl' before testing\n", - Data::Dumper->Dump([$o], ['$o']), "\0"); + Data::Dumper->Dump([$o], ['$o']), if_($replay, q( +package install_steps_auto_install; +$graphical = 1; +push @graphical_steps, 'doPartitionDisks', 'choosePartitionsToFormat'; +)), "\0"); } |