diff options
author | Pascal Rigaux <pixel@mandriva.com> | 2002-03-06 11:58:44 +0000 |
---|---|---|
committer | Pascal Rigaux <pixel@mandriva.com> | 2002-03-06 11:58:44 +0000 |
commit | f51b306f56dbc5a87ec9c2356d207054c4ef5a26 (patch) | |
tree | b6fb1147dbacba8b03aada432847d53712409a5c | |
parent | f03ae92232e5695968b76f38a0935d1ca758cbcc (diff) | |
download | drakx-f51b306f56dbc5a87ec9c2356d207054c4ef5a26.tar drakx-f51b306f56dbc5a87ec9c2356d207054c4ef5a26.tar.gz drakx-f51b306f56dbc5a87ec9c2356d207054c4ef5a26.tar.bz2 drakx-f51b306f56dbc5a87ec9c2356d207054c4ef5a26.tar.xz drakx-f51b306f56dbc5a87ec9c2356d207054c4ef5a26.zip |
(g_auto_install): use "interactiveSteps" field instead of pushing in @install_steps_auto_install::graphical_steps
-rw-r--r-- | perl-install/install_any.pm | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/perl-install/install_any.pm b/perl-install/install_any.pm index 5fc19c3d5..fe6f2033e 100644 --- a/perl-install/install_any.pm +++ b/perl-install/install_any.pm @@ -655,7 +655,8 @@ sub g_auto_install { } local $o->{partitioning}{auto_allocate} = !$replay; - local $o->{autoExitInstall} = !$replay; + $o->{autoExitInstall} = !$replay; + $o->{interactiveSteps} = [ 'doPartitionDisks', 'formatPartitions'] if $replay; #- deep copy because we're modifying it below $o->{users} = [ @{$o->{users} || []} ]; @@ -673,12 +674,7 @@ sub g_auto_install { # You should check the syntax of this file before using it in an auto-install. # You can do this with 'perl -cw auto_inst.cfg.pl' or by executing this file # (note the '#!/usr/bin/perl -cw' on the first line). -", - Data::Dumper->Dump([$o], ['$o']), if_($replay, -qq(\npackage install_steps_auto_install;), q( -$graphical = 1; -push @graphical_steps, 'doPartitionDisks', 'formatPartitions'; -)), "\0"); +", Data::Dumper->Dump([$o], ['$o']), "\0"); $str =~ s/ {8}/\t/g; #- replace all 8 space char by only one tabulation, this reduces file size so much :-) $str; } |