diff options
| -rw-r--r-- | perl-install/ChangeLog | 5 | ||||
| -rw-r--r-- | perl-install/devices.pm | 3 | ||||
| -rw-r--r-- | perl-install/install2.pm | 2 | ||||
| -rw-r--r-- | perl-install/install_steps.pm | 2 |
4 files changed, 9 insertions, 3 deletions
diff --git a/perl-install/ChangeLog b/perl-install/ChangeLog index 236ff2e3b..92b1fd02b 100644 --- a/perl-install/ChangeLog +++ b/perl-install/ChangeLog @@ -1,3 +1,8 @@ +2000-05-04 Pixel <pixel@mandrakesoft.com> + + * install2.pm: get rid of autoformat + * install_steps.pm (choosePartitionsToFormat): get rid of autoformat + 2000-05-03 Pixel <pixel@mandrakesoft.com> * any.pm (setupBootloader): replace ask_many_from_list by diff --git a/perl-install/devices.pm b/perl-install/devices.pm index 1a84d84ae..b0be9577f 100644 --- a/perl-install/devices.pm +++ b/perl-install/devices.pm @@ -110,7 +110,8 @@ sub entry { "sbpcd" => [ c::S_IFBLK(), 25, 0 ], "sjcd" => [ c::S_IFBLK(), 18, 0 ], "tty" => [ c::S_IFCHR(), 5, 0 ], - "usbmouse"=> [ c::S_IFCHR(), 10, 32], #- aka hidbp-mse-0 +# "usbmouse"=> [ c::S_IFCHR(), 10, 32], #- aka hidbp-mse-0 + "usbmouse"=> [ c::S_IFCHR(), 13, 32], #- aka /dev/usb/usbmouse0 "zero" => [ c::S_IFCHR(), 1, 5 ], }}{$_} or die "unknown device $_" }; } diff --git a/perl-install/install2.pm b/perl-install/install2.pm index e2b45e7b0..37b0f75d2 100644 --- a/perl-install/install2.pm +++ b/perl-install/install2.pm @@ -141,7 +141,7 @@ $o = $::o = { autoSCSI => 0, mkbootdisk => 1, #- no mkbootdisk if 0 or undef, find a floppy with 1, or fd1 #- packages => [ qw() ], - partitioning => { clearall => 0, eraseBadPartitions => 0, auto_allocate => 0, autoformat => 0 }, #-, readonly => 0 }, + partitioning => { clearall => 0, eraseBadPartitions => 0, auto_allocate => 0 }, #-, readonly => 0 }, #- security => 2, shells => [ map { "/bin/$_" } qw(bash tcsh zsh ash ksh) ], authentication => { md5 => 1, shadow => 1 }, diff --git a/perl-install/install_steps.pm b/perl-install/install_steps.pm index c47099400..06b486091 100644 --- a/perl-install/install_steps.pm +++ b/perl-install/install_steps.pm @@ -196,7 +196,7 @@ sub choosePartitionsToFormat($$) { $_->{mntpoint} = "swap" if isSwap($_); $_->{mntpoint} or next; - add2hash_($_, { toFormat => $_->{notFormatted} || $o->{partitioning}{autoformat} }); + add2hash_($_, { toFormat => $_->{notFormatted} }); if (!$_->{toFormat}) { my $t = isLoopback($_) ? eval { fsedit::typeOfPart($o->{prefix} . loopback::file($_)) } : |