summaryrefslogtreecommitdiffstats
path: root/perl-install/install2.pm
diff options
context:
space:
mode:
authorPascal Rigaux <pixel@mandriva.com>2000-09-26 16:45:13 +0000
committerPascal Rigaux <pixel@mandriva.com>2000-09-26 16:45:13 +0000
commit545871c95d33a71f30d6cac47387c21b3d6ceb48 (patch)
treeffed9330922ecf2e863402ead159d1c79351f81d /perl-install/install2.pm
parent34927221ac7695d8bbd52cd0d866024342cabb76 (diff)
downloaddrakx-545871c95d33a71f30d6cac47387c21b3d6ceb48.tar
drakx-545871c95d33a71f30d6cac47387c21b3d6ceb48.tar.gz
drakx-545871c95d33a71f30d6cac47387c21b3d6ceb48.tar.bz2
drakx-545871c95d33a71f30d6cac47387c21b3d6ceb48.tar.xz
drakx-545871c95d33a71f30d6cac47387c21b3d6ceb48.zip
*** empty log message ***
Diffstat (limited to 'perl-install/install2.pm')
-rw-r--r--perl-install/install2.pm35
1 files changed, 17 insertions, 18 deletions
diff --git a/perl-install/install2.pm b/perl-install/install2.pm
index 2069f01be..93d5347e7 100644
--- a/perl-install/install2.pm
+++ b/perl-install/install2.pm
@@ -600,23 +600,6 @@ sub main {
$o->{allowFB} = listlength(cat_("/proc/fb"));
- my $o_;
- while (1) {
- require"install_steps_$o->{interactive}.pm";
- $o_ = $::auto_install ?
- install_steps_auto_install->new($o) :
- $o->{interactive} eq "stdio" ?
- install_steps_stdio->new($o) :
- $o->{interactive} eq "newt" ?
- install_steps_newt->new($o) :
- $o->{interactive} eq "gtk" ?
- install_steps_gtk->new($o) :
- die "unknown install type";
- $o_ and last;
-
- $o->{interactive} = "newt";
- require install_steps_newt;
- }
my $VERSION = cat__(install_any::getFile("VERSION"));
$o->{lnx4win} = 1 if $VERSION =~ /lnx4win/i;
$o->{meta_class} = 'desktop' if $VERSION =~ /desktop/i;
@@ -630,13 +613,29 @@ sub main {
push @auto, 'selectInstallClass', 'selectMouse', 'doPartitionDisks', 'choosePackages', 'configureTimezone', 'exitInstall';
}
-
foreach (@auto) {
eval "undef *" . (!/::/ && "install_steps_interactive::") . $_;
my $s = $o->{steps}{/::(.*)/ ? $1 : $_} or next;
$s->{hidden} = 1;
}
+ my $o_;
+ while (1) {
+ require"install_steps_$o->{interactive}.pm";
+ $o_ = $::auto_install ?
+ install_steps_auto_install->new($o) :
+ $o->{interactive} eq "stdio" ?
+ install_steps_stdio->new($o) :
+ $o->{interactive} eq "newt" ?
+ install_steps_newt->new($o) :
+ $o->{interactive} eq "gtk" ?
+ install_steps_gtk->new($o) :
+ die "unknown install type";
+ $o_ and last;
+
+ $o->{interactive} = "newt";
+ require install_steps_newt;
+ }
$::o = $o = $o_;
if (-e "/tmp/network") {