summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--Makefile2
-rw-r--r--docs/comparisons38
-rw-r--r--perl-install/ChangeLog32
-rw-r--r--perl-install/commands.pm2
-rw-r--r--perl-install/install_steps_gtk.pm4
-rw-r--r--perl-install/install_steps_interactive.pm2
-rwxr-xr-xperl-install/standalone/mousedrake2
7 files changed, 51 insertions, 31 deletions
diff --git a/Makefile b/Makefile
index d2c853bb3..91fd28866 100644
--- a/Makefile
+++ b/Makefile
@@ -94,7 +94,7 @@ upload: clean install
for i in $(RELEASE_BOOT_IMG); do upload images $$i; done ;\
echo
- perl -pe 'exit if / DrakX </' perl-install/ChangeLog | mail -s 'new DrakX snapshot' changelog@linux-mandrake.com install@linux-mandrake.com
+ perl -pe 'exit if / DrakX </' perl-install/ChangeLog | tools/mailchangelog
tools/addchangelog perl-install/ChangeLog 'snapshot uploaded'
cvs commit perl-install/ChangeLog # otherwise i always have a conflict :-(
diff --git a/docs/comparisons b/docs/comparisons
new file mode 100644
index 000000000..f0be16971
--- /dev/null
+++ b/docs/comparisons
@@ -0,0 +1,38 @@
+redhat 6.1 (fr?), install 766MB, df 900MB, 35min (asked for all groups except "everything")
+
+upgrade to redhat 6.2, sum 757MB, df 936MB, 20min
+
+mandrake 7.1, install 755MB, df 1091MB, 17min (asked install size 910MB), 515 packages
+
+upgrade to cooker, sum 1000MB, df 1404MB, 35min
+
+
+redhat 7.0b, install 815MB, df 960MB, 18min
+
+7.2b, 3.3GB 2h26
+
+
+7.2b: (lang fr)
+compssLevel df rpm time fs
+
+100 64 59 0:59 ext2 500M
+ 90 132 127 1:50 ext2 500M
+ 80 226 218 3:26 ext2 500M
+ 70 449 387 5:52 ext2 1G
+ 60 614 541 8:36 ext2 1G
+ 50 1113 943 17:40 ext2 2G
+ 40 1193 1013 20:39 ext2 2G
+ 30 1262 1072 22:28 ext2 2G
+ 20 1445 1219 27:34 ext2 2G
+ 10 1649 1394 36:58 ext2 2G
+ 0 1943 1638 48:02 ext2 2G
+-10 2957 2519 101:49 ext2 4G
+
+
+7.2b: (lang all)
+compssLevel df rpm time fs
+
+100 70 59 1:04 ext2 500M
+ 90 289 281 4:20 ext2 500M
+ 80 373 361 5:41 ext2 500M
+ 70 890 794 13:28 ext2 1G
diff --git a/perl-install/ChangeLog b/perl-install/ChangeLog
index 6c2346a73..5eb017dfb 100644
--- a/perl-install/ChangeLog
+++ b/perl-install/ChangeLog
@@ -1,32 +1,12 @@
2000-09-24 Pixel <pixel@mandrakesoft.com>
- * fs.pm (umount): remove the ending "/" in the mntpoint. Otherwise
- the mtab updating fails to update properly
+ * commands.pm (bug): use first floppy drive instead of fd0 hard
+ coded (nice for LS120's)
-2000-09-23 Pixel <pixel@mandrakesoft.com>
-
- * partition_table.pm (active): set the hd dirty
-
- * services.pm (services): patched to handle xinetd sub-services
-
- * install2.pm (formatPartitions): unset choosePackages done, so
- that choosePackages is done again
-
- * install_steps.pm (doPartitionDisksBefore): close pkgs::LOG and
- umount /mnt/proc so that going back to partitioning doesn't fail
- because /mnt can't be umounted.
- umount_all twice after a sleep (HACK)
-
- * pkgs.pm: updated $A, $B and $C for 7.2 (used by correctSize and
- invCorrectSize)
-
-2000-09-23 dam's <damien@mandrakesoft.com>
-
- * netconnect.pm (isdn_detect): log NET_DEVICE when isdn too.
-
-2000-09-23 DrakX <install@linux-mandrake.com>
-
- * snapshot uploaded
+ * install_steps_gtk.pm (selectMouse): if device changed, do the
+ test
+ * standalone/mousedrake: fix for serial mice
+ * install_steps_interactive.pm (selectMouse): fix for serial mice
2000-09-23 dam's <damien@mandrakesoft.com>
diff --git a/perl-install/commands.pm b/perl-install/commands.pm
index f23caef0d..311b204f2 100644
--- a/perl-install/commands.pm
+++ b/perl-install/commands.pm
@@ -561,7 +561,7 @@ sub install_cpio($$;@) {
sub bug {
my ($h) = getopts(\@_, "h");
$h and die "usage: bug\nput file report.bug on fat formatted floppy\n";
- mount "/dev/fd0", "/fd0";
+ mount devices::make(first(detect_devices::floppies())), "/fd0";
sub header { "
********************************************************************************
diff --git a/perl-install/install_steps_gtk.pm b/perl-install/install_steps_gtk.pm
index bfe21d896..6ae0b53e1 100644
--- a/perl-install/install_steps_gtk.pm
+++ b/perl-install/install_steps_gtk.pm
@@ -172,7 +172,9 @@ sub selectMouse {
my %old = %{$o->{mouse}};
$o->SUPER::selectMouse($force);
my $mouse = $o->{mouse};
- $old{type} eq $mouse->{type} && $old{name} eq $mouse->{name} && !$force and return;
+ $old{type} eq $mouse->{type} &&
+ $old{name} eq $mouse->{name} &&
+ $old{device} eq $mouse->{device} && !$force and return;
local $my_gtk::grab = 1; #- unsure a crazy mouse don't go wild clicking everywhere
diff --git a/perl-install/install_steps_interactive.pm b/perl-install/install_steps_interactive.pm
index 6e315de27..2c35a4e9e 100644
--- a/perl-install/install_steps_interactive.pm
+++ b/perl-install/install_steps_interactive.pm
@@ -164,7 +164,7 @@ sub selectMouse {
sub { join '|', map { translate($_) } split '\|', $_[0] },
[ mouse::fullnames ], $prev)) if $force;
- if ($force && $o->{mouse}{device} eq "ttyS") {
+ if ($force && $o->{mouse}{type} eq 'serial') {
$o->set_help('selectSerialPort');
$o->{mouse}{device} =
$o->ask_from_listf(_("Mouse Port"),
diff --git a/perl-install/standalone/mousedrake b/perl-install/standalone/mousedrake
index 93fc3081e..e1d3456b7 100755
--- a/perl-install/standalone/mousedrake
+++ b/perl-install/standalone/mousedrake
@@ -39,7 +39,7 @@ $mouse->{XEMU3} = 'yes' if $mouse->{nbuttons} < 3 && (!$::noauto || $in->ask_yes
$mouse->{device} = mouse::serial_ports_names2dev(
$in->ask_from_list(_("Mouse Port"),
_("Which serial port is your mouse connected to?"),
- [ mouse::serial_ports_names() ])) if $mouse->{device} eq "ttyS";
+ [ mouse::serial_ports_names() ])) if $mouse->{type} eq 'serial';
mouse::write('', $mouse);
modules::write_conf('') if $mouse->{device} eq "usbmouse" && !$::testing;