diff options
| -rw-r--r-- | docs/comparisons | 1 | ||||
| -rw-r--r-- | perl-install/ChangeLog | 5 | ||||
| -rw-r--r-- | perl-install/install_any.pm | 2 | ||||
| -rw-r--r-- | perl-install/mouse.pm | 2 | ||||
| -rw-r--r-- | perl-install/share/list | 9 |
5 files changed, 17 insertions, 2 deletions
diff --git a/docs/comparisons b/docs/comparisons index 97e37c23d..881cf3a27 100644 --- a/docs/comparisons +++ b/docs/comparisons @@ -8,6 +8,7 @@ upgrade to cooker, sum 1000MB, df 1404MB, 35min redhat 7.0b, install 815MB, df 960MB, 18min +redhat 7.0, install 995MB, df MB, 26min 7.2b, 3.3GB 2h26 diff --git a/perl-install/ChangeLog b/perl-install/ChangeLog index c7b1148ff..23f40d5b8 100644 --- a/perl-install/ChangeLog +++ b/perl-install/ChangeLog @@ -1,3 +1,8 @@ +2000-09-26 Pixel <pixel@mandrakesoft.com> + + * mouse.pm (read): catch exception if fullname2mouse fails (eg: + old FULLNAME format) + 2000-09-25 Pixel <pixel@mandrakesoft.com> * share/MonitorsDB: merge with latest redhat MonitorsDB diff --git a/perl-install/install_any.pm b/perl-install/install_any.pm index e919ec395..9ee692fd2 100644 --- a/perl-install/install_any.pm +++ b/perl-install/install_any.pm @@ -623,7 +623,7 @@ sub suggest_mount_points { } #- $_->{mntpoint} || fsedit::suggest_part($_, $hds) foreach @parts; - $_->{mntpoint} and log::l("suggest_mount_points: $_->{device} -> $_->{mntpoint}") foreach @parts; + $_->{mntpoint} and log::l("suggest_mount_points: $_->{device} -> $_->{mntpoint}") foreach fsedit::get_fstab(@$hds); } #- mainly for finding the root partitions for upgrade diff --git a/perl-install/mouse.pm b/perl-install/mouse.pm index 3366e0807..d942c54c2 100644 --- a/perl-install/mouse.pm +++ b/perl-install/mouse.pm @@ -150,7 +150,7 @@ sub serial_port2text { sub read { my ($prefix) = @_; my %mouse = getVarsFromSh "$prefix/etc/sysconfig/mouse"; - add2hash_(\%mouse, fullname2mouse($mouse{FULLNAME})); + eval { add2hash_(\%mouse, fullname2mouse($mouse{FULLNAME})) }; $mouse{device} = readlink "$prefix/dev/mouse" or log::l("reading $prefix/dev/mouse symlink failed"); $mouse{nbuttons} = $mouse{XEMU3} eq "yes" ? 2 : $mouse{WHEEL} eq "yes" ? 5 : 3; \%mouse; diff --git a/perl-install/share/list b/perl-install/share/list index febd54c25..ef2b768cd 100644 --- a/perl-install/share/list +++ b/perl-install/share/list @@ -108,3 +108,12 @@ /usr/lib/rpm/rpmrc /usr/sbin/ext2resize /usr/sbin/rescuept +/usr/share/icons/amusement_section.xpm +/usr/share/icons/chat_section.xpm +/usr/share/icons/default_section.xpm +/usr/share/icons/documentation_section.xpm +/usr/share/icons/graphics_section.xpm +/usr/share/icons/multimedia_section.xpm +/usr/share/icons/networking_section.xpm +/usr/share/icons/office_section.xpm +/usr/share/icons/windowmanager_section.xpm |