diff options
Diffstat (limited to 'perl-install')
| -rw-r--r-- | perl-install/any.pm | 3 | ||||
| -rw-r--r-- | perl-install/install_interactive.pm | 11 | ||||
| -rw-r--r-- | perl-install/install_steps_gtk.pm | 2 | ||||
| -rw-r--r-- | perl-install/modules.pm | 14 | ||||
| -rw-r--r-- | perl-install/share/compssList | 2 |
5 files changed, 19 insertions, 13 deletions
diff --git a/perl-install/any.pm b/perl-install/any.pm index 512f753fc..1e604d85b 100644 --- a/perl-install/any.pm +++ b/perl-install/any.pm @@ -281,7 +281,8 @@ sub inspect { $dir = ''; } else { mkdir $dir, 0700; - fs::mount($part->{device}, $dir, type2fs($part->{type}), !$rw); + eval { fs::mount($part->{device}, $dir, type2fs($part->{type}), !$rw) }; + $@ and return; } my $h = before_leaving { if (!$part->{isMounted} && $dir) { diff --git a/perl-install/install_interactive.pm b/perl-install/install_interactive.pm index d27fdd1f4..8d40e3f49 100644 --- a/perl-install/install_interactive.pm +++ b/perl-install/install_interactive.pm @@ -18,11 +18,11 @@ use modules; sub partition_with_diskdrake { - my ($o, $hds) = @_; + my ($o, $hds, $nowizard) = @_; my $ok = 1; do { - diskdrake::main($hds, $o->{raid}, interactive_gtk->new, $o->{partitions}); - delete $o->{wizard} and return partitionWizard($o); + diskdrake::main($hds, $o->{raid}, interactive_gtk->new, $o->{partitions}, $nowizard); + delete $o->{wizard} and return partitionWizard($o, 'nodiskdrake'); my @fstab = fsedit::get_fstab(@$hds); unless (fsedit::get_root(\@fstab)) { @@ -146,7 +146,7 @@ When sure, press Ok.")) or return; } if (!$readonly && ref($o) =~ /gtk/) { #- diskdrake only available in gtk for now - $solutions{diskdrake} = [ 0, _("Use diskdrake"), sub { partition_with_diskdrake($o, $hds) } ]; + $solutions{diskdrake} = [ 0, _("Use diskdrake"), sub { partition_with_diskdrake($o, $hds, 'nowizard') } ]; } $solutions{fdisk} = @@ -168,9 +168,10 @@ When you are done, don't forget to save using `w'", partition_table_raw::descrip } sub partitionWizard { - my ($o) = @_; + my ($o, $nodiskdrake) = @_; my %solutions = partitionWizardSolutions($o, $o->{hds}, $o->{fstab}, $o->{partitioning}{readonly}); + delete $solutions{diskdrake} if $nodiskdrake; my @solutions = sort { $b->[0] <=> $a->[0] } values %solutions; diff --git a/perl-install/install_steps_gtk.pm b/perl-install/install_steps_gtk.pm index 2e66f5ce4..a94c55711 100644 --- a/perl-install/install_steps_gtk.pm +++ b/perl-install/install_steps_gtk.pm @@ -465,7 +465,7 @@ sub installPackages { my ($current_total_size, $last_size, $nb, $total_size, $start_time, $last_dtime, $trans_progress_total); - my $w = my_gtk->new(_("Installing"), grab => 1); + my $w = my_gtk->new(_("Installing")); $w->{window}->set_usize($::windowwidth * 0.8, 260); my $text = new Gtk::Label; my ($msg, $msg_time_remaining, $msg_time_total) = map { new Gtk::Label($_) } '', (_("Estimating")) x 2; diff --git a/perl-install/modules.pm b/perl-install/modules.pm index 42c2a8171..5af4358dd 100644 --- a/perl-install/modules.pm +++ b/perl-install/modules.pm @@ -1,5 +1,6 @@ package modules; +use strict; use vars qw(%drivers); use common qw(:common :file :system); @@ -370,6 +371,12 @@ sub remove_alias($) { 0; } +sub when_load { + my ($name, $type, @options) = @_; + add_alias('scsi_hostadapter', $name), load('sd_mod') if $type =~ /scsi/ || $type eq $type_aliases{scsi}; + $conf{$name}{options} = join " ", @options if @options; +} + sub load { my ($name, $type, @options) = @_; @@ -388,10 +395,7 @@ sub load { -d "/proc/scsi/usb" or return; $conf{"usb-storage"}{"post-install"} = "modprobe usbkbd; modprobe keybdev"; } - if ($type) { - add_alias('scsi_hostadapter', $name), load('sd_mod') if $type =~ /scsi/ || $type eq $type_aliases{scsi}; - } - $conf{$name}{options} = join " ", @options if @options; + when_load($name, $type, @options); } sub load_multi { my $f; $f = sub { map { $f->(@{$deps{$_}}), $_ } @_ }; @@ -452,7 +456,7 @@ sub read_already_loaded() { foreach (cat_("/proc/modules")) { my ($name) = split; $conf{$name}{loaded} = 1; - push @$l, $name unless member($name, @$l); + when_load($name, $drivers{$name}{type}); } } diff --git a/perl-install/share/compssList b/perl-install/share/compssList index e85322a51..edddcbaf9 100644 --- a/perl-install/share/compssList +++ b/perl-install/share/compssList @@ -683,7 +683,7 @@ kmag 72 0 60 kmol 72 0 60 kmp3 72 0 60 kmp3te 72 0 60 -koffice 65 0 55 +koffice 71 0 55 koffice-devel 0 0 35 kon2 -12 -60 -15 kover 72 0 60 |