From 2812763c984bdfdbdfa63a6e79570555cddcee1c Mon Sep 17 00:00:00 2001 From: Pascal Rigaux Date: Fri, 23 Feb 2001 21:35:04 +0000 Subject: (g_auto_install): handle $replay flag. It means a 'not fully automated install'. --- perl-install/install_any.pm | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) (limited to 'perl-install/install_any.pm') 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"); } -- cgit v1.2.1