diff options
| author | Pascal Rigaux <pixel@mandriva.com> | 2003-01-30 22:56:02 +0000 |
|---|---|---|
| committer | Pascal Rigaux <pixel@mandriva.com> | 2003-01-30 22:56:02 +0000 |
| commit | db0dc40ad297041e36bb39ec5993db30b94cbf27 (patch) | |
| tree | 95005c1df4df63c8c03c8d63a1d0ab1f8591e233 | |
| parent | 4f85b0d92b9246709a53a85b45b15f73c7d97086 (diff) | |
| download | drakx-db0dc40ad297041e36bb39ec5993db30b94cbf27.tar drakx-db0dc40ad297041e36bb39ec5993db30b94cbf27.tar.gz drakx-db0dc40ad297041e36bb39ec5993db30b94cbf27.tar.bz2 drakx-db0dc40ad297041e36bb39ec5993db30b94cbf27.tar.xz drakx-db0dc40ad297041e36bb39ec5993db30b94cbf27.zip | |
drop $o->{lnx4win} handling
| -rw-r--r-- | perl-install/install2.pm | 2 | ||||
| -rw-r--r-- | perl-install/install_interactive.pm | 7 |
2 files changed, 0 insertions, 9 deletions
diff --git a/perl-install/install2.pm b/perl-install/install2.pm index 601d59f01..8f93705dd 100644 --- a/perl-install/install2.pm +++ b/perl-install/install2.pm @@ -374,7 +374,6 @@ sub main { step => sub { $o->{steps}{first} = $v }, expert => sub { $::expert = $v }, meta_class => sub { $o->{meta_class} = $v }, - lnx4win => sub { $o->{lnx4win} = 1 }, readonly => sub { $o->{partitioning}{readonly} = $v ne "0" }, display => sub { $o->{display} = $v }, askdisplay => sub { print "Please enter the X11 display to perform the install on ? "; $o->{display} = chomp_(scalar(<STDIN>)) }, @@ -514,7 +513,6 @@ sub main { $o->{allowFB} = listlength(cat_("/proc/fb")); my $VERSION = cat__(install_any::getFile("VERSION")) or do { print "VERSION file missing\n"; sleep 5 }; - $o->{lnx4win} = 1 if $VERSION =~ /lnx4win/i; $o->{meta_class} = 'desktop' if $VERSION =~ /desktop/i; $o->{meta_class} = 'firewall' if $VERSION =~ /firewall/i; $o->{meta_class} = 'server' if $VERSION =~ /server/i; diff --git a/perl-install/install_interactive.pm b/perl-install/install_interactive.pm index 6acece384..846365853 100644 --- a/perl-install/install_interactive.pm +++ b/perl-install/install_interactive.pm @@ -226,13 +226,6 @@ sub partitionWizard { $o->set_help('doPartitionDisks'); my %solutions = partitionWizardSolutions($o, $o->{all_hds}); - if ($o->{lnx4win}) { - if ($solutions{loopback}) { - %solutions = (loopback => $solutions{loopback}); - } else { - $o->ask_warn('', N("You don't have enough free space on your Windows partition")) if any { isFat($_) } fsedit::get_all_fstab($o->{all_hds}); - } - } delete $solutions{diskdrake} if $nodiskdrake; |