diff options
-rw-r--r-- | perl-install/install2.pm | 22 | ||||
-rw-r--r-- | perl-install/install_any.pm | 4 | ||||
-rw-r--r-- | perl-install/install_steps_interactive.pm | 3 | ||||
-rw-r--r-- | perl-install/pkgs.pm | 6 | ||||
-rw-r--r-- | perl-install/printer.pm | 2 |
5 files changed, 25 insertions, 12 deletions
diff --git a/perl-install/install2.pm b/perl-install/install2.pm index 2a388a5d0..fc06ec063 100644 --- a/perl-install/install2.pm +++ b/perl-install/install2.pm @@ -266,7 +266,7 @@ sub setupSCSI { #------------------------------------------------------------------------------ sub partitionDisks { - return if ($o->{isUpgrade}); + return if $o->{lnx4win} || $o->{isUpgrade}; $::o->{steps}{formatPartitions}{done} = 0; eval { fs::umount_all($o->{fstab}, $o->{prefix}) } if $o->{fstab} && !$::testing; @@ -293,7 +293,7 @@ sub partitionDisks { } sub formatPartitions { - return if ($o->{isUpgrade}); + return if $o->{lnx4win} || $o->{isUpgrade}; $o->choosePartitionsToFormat($o->{fstab}); @@ -359,18 +359,22 @@ sub configureTimezone { $o->timeConfig($f); } #------------------------------------------------------------------------------ -sub configureServices { $o->servicesConfig } +sub configureServices { + return if $o->{lnx4win}; + + $o->servicesConfig; +} #------------------------------------------------------------------------------ sub configurePrinter { $o->printerConfig } #------------------------------------------------------------------------------ sub setRootPassword { - return if ($o->{isUpgrade}); + return if $o->{isUpgrade}; $o->setRootPassword; } #------------------------------------------------------------------------------ sub addUser { - return if ($o->{isUpgrade}); + return if $o->{isUpgrade}; $o->addUser; @@ -383,11 +387,15 @@ sub addUser { #-PADTODO sub createBootdisk { modules::write_conf("$o->{prefix}/etc/conf.modules", 'append'); + + return if $o->{lnx4win}; $o->createBootdisk($_[1] == 1); } #------------------------------------------------------------------------------ sub setupBootloader { + return if $o->{lnx4win}; + $o->setupBootloaderBefore if $_[1] == 1; $o->setupBootloader($_[1] - 1); } @@ -426,6 +434,8 @@ sub main { $o->{pcmcia} = shift; } elsif (/--readonly/) { $o->{partitioning}{readonly} = 1; + } elsif (/--lnx4win/) { + $o->{lnx4win} = 1; } } @@ -527,6 +537,8 @@ sub main { fs::write($o->{prefix}, $o->{fstab}); modules::write_conf("$o->{prefix}/etc/conf.modules", 'append'); + run_program::run("/usr/bin/postinstall2") if $o->{lnx4win}; + killCardServices(); log::l("installation complete, leaving"); diff --git a/perl-install/install_any.pm b/perl-install/install_any.pm index 7d1929e03..3d00b7d2b 100644 --- a/perl-install/install_any.pm +++ b/perl-install/install_any.pm @@ -98,8 +98,8 @@ sub shells($) { sub getAvailableSpace { my ($o) = @_; - do { $_->{mntpoint} eq '/usr' and return int($_->{size} * 512 / 1.03) } foreach @{$o->{fstab}}; - do { $_->{mntpoint} eq '/' and return int($_->{size} * 512 / 1.03) } foreach @{$o->{fstab}}; + do { $_->{mntpoint} eq '/usr' and return int($_->{size} * 512 / 1.07) } foreach @{$o->{fstab}}; + do { $_->{mntpoint} eq '/' and return int($_->{size} * 512 / 1.07) } foreach @{$o->{fstab}}; if ($::testing) { log::l("taking 200MB for testing"); diff --git a/perl-install/install_steps_interactive.pm b/perl-install/install_steps_interactive.pm index 22ab2a0c9..545b58481 100644 --- a/perl-install/install_steps_interactive.pm +++ b/perl-install/install_steps_interactive.pm @@ -34,6 +34,7 @@ use lilo; #-###################################################################################### sub errorInStep($$) { my ($o, $err) = @_; + $err =~ s/(.*) at .*?$/$1\./ unless $::testing; #- avoid error message. $o->ask_warn(_("Error"), [ _("An error occurred"), $err ]); } @@ -783,7 +784,7 @@ sub load_thiskind { my ($o, $type) = @_; my $w; #- needed to make the wait_message stay alive my $pcmcia = $o->{pcmcia} - unless $::expert && modules::pcmcia_need_config($o->{pcmcia}) && + unless !$::beginner && modules::pcmcia_need_config($o->{pcmcia}) && $o->ask_yesorno('', _("Skip PCMCIA probing", 1)); $w = $o->wait_message(_("PCMCIA"), _("Configuring PCMCIA cards...")) if modules::pcmcia_need_config($pcmcia); modules::load_thiskind($type, sub { $w = wait_load_module($o, $type, @_) }, $pcmcia); diff --git a/perl-install/pkgs.pm b/perl-install/pkgs.pm index eb72a1bf1..e12d2b4b3 100644 --- a/perl-install/pkgs.pm +++ b/perl-install/pkgs.pm @@ -2,7 +2,7 @@ package pkgs; use diagnostics; use strict; -use vars qw(*LOG $size_correction_ratio); +use vars qw(*LOG); use common qw(:common :file :functional); use install_any; @@ -12,8 +12,6 @@ use fs; use lang; use c; -$size_correction_ratio = 1.04; - my @skip_list = qw( XFree86-8514 XFree86-AGX XFree86-Mach32 XFree86-Mach64 XFree86-Mach8 XFree86-Mono XFree86-P9000 XFree86-S3 XFree86-S3V XFree86-SVGA XFree86-W32 XFree86-I128 @@ -23,6 +21,8 @@ hackkernel hackkernel-BOOT hackkernel-fb hackkernel-headers hackkernel-pcmcia-cs hackkernel-smp hackkernel-smp-fb );#) +sub correctSize { (20471 - $_[0])*$_[0]/16258 } #- size correction in MB. + sub Package { my ($packages, $name) = @_; $packages->{$name} or log::l("unknown package `$name'") && undef; diff --git a/perl-install/printer.pm b/perl-install/printer.pm index 4686ae38f..f2aa20533 100644 --- a/perl-install/printer.pm +++ b/perl-install/printer.pm @@ -386,7 +386,7 @@ sub copy_master_filter($) { my $complete_path = "$prefix/$queue_path/filter"; my $master_filter = "$prefix/$PRINTER_FILTER_DIR/master-filter"; - eval { commands::cp($master_filter, $complete_path) }; + eval { commands::cp('-f', $master_filter, $complete_path) }; #- -f for update. $@ and die "Can't copy $master_filter to $complete_path $!"; } |