From 164e94e201e9d49ab9464fc737dfcfbc43f6e596 Mon Sep 17 00:00:00 2001 From: Pascal Rigaux Date: Tue, 9 May 2000 12:07:40 +0000 Subject: no_comment --- perl-install/ChangeLog | 6 ++++++ perl-install/any.pm | 4 ++-- perl-install/devices.pm | 6 +++--- perl-install/fs.pm | 1 + perl-install/install_any.pm | 4 ++-- perl-install/install_steps.pm | 2 +- perl-install/install_steps_interactive.pm | 2 +- perl-install/pkgs.pm | 2 +- perl-install/share/list | 1 + perl-install/share/list.sparc | 1 - perl-install/standalone/mousedrake | 7 +++++++ 11 files changed, 25 insertions(+), 11 deletions(-) (limited to 'perl-install') diff --git a/perl-install/ChangeLog b/perl-install/ChangeLog index 52169605a..78337e540 100644 --- a/perl-install/ChangeLog +++ b/perl-install/ChangeLog @@ -1,3 +1,9 @@ +2000-05-09 Pixel + + * standalone/mousedrake: add handling of XF86Config-4 + + * any.pm (setupBootloader): fix bug (was adding 2 glob_'s) + 2000-05-08 Pixel * install2.pm (main): move the touch of some files here to please linuxconf diff --git a/perl-install/any.pm b/perl-install/any.pm index f4133399c..2afc3b251 100644 --- a/perl-install/any.pm +++ b/perl-install/any.pm @@ -139,10 +139,10 @@ You can add some more or change the existing ones."), my @l; if ($e->{type} eq "image") { @l = ( -_("Image") => { val => \$e->{kernel_or_dev}, list => [ eval { map { s/$prefix// } glob_("$prefix/boot/vmlinuz*") } ] }, +_("Image") => { val => \$e->{kernel_or_dev}, list => [ eval { map { s/$prefix//; $_ } glob_("$prefix/boot/vmlinuz*") } ] }, _("Root") => { val => \$e->{root}, list => [ map { "/dev/$_->{device}" } @$fstab ], not_edit => !$::expert }, _("Append") => \$e->{append}, -_("Initrd") => { val => \$e->{initrd}, list => [ eval { map { s/$prefix// } glob_("$prefix/boot/initrd*") } ] }, +_("Initrd") => { val => \$e->{initrd}, list => [ eval { map { s/$prefix//; $_ } glob_("$prefix/boot/initrd*") } ] }, _("Read-write") => { val => \$e->{'read-write'}, type => 'bool' } ); @l = @l[0..5] unless $::expert; diff --git a/perl-install/devices.pm b/perl-install/devices.pm index 1b2289f4d..2a0c048a4 100644 --- a/perl-install/devices.pm +++ b/perl-install/devices.pm @@ -63,7 +63,7 @@ sub entry { 'c' => [22,0], 'd' => [22,64], 'e' => [33,0], 'f' => [33,64], 'g' => [34,0], 'h' => [34,64], - }}{$1} or die "unknown device $_" }; + }}{$1} or die "unknown device $_ (caller is " . caller . ")" }; $minor += $2 || 0; } elsif (/^ram(.*)/) { $type = c::S_IFBLK(); @@ -111,8 +111,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(), 13, 32], #- aka /dev/usb/usbmouse0 +# "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/fs.pm b/perl-install/fs.pm index c787561a8..230db934d 100644 --- a/perl-install/fs.pm +++ b/perl-install/fs.pm @@ -247,6 +247,7 @@ sub mount_part($;$$) { $mntpoint = "/initrd/loopfs"; } mount(devices::make($dev), $mntpoint, type2fs($part->{type}), $rdonly); + rmdir "$mntpoint/lost+found"; } } $part->{isMounted} = $part->{isFormatted} = 1; #- assume that if mount works, partition is formatted diff --git a/perl-install/install_any.pm b/perl-install/install_any.pm index 89205de2a..ef54c8dcd 100644 --- a/perl-install/install_any.pm +++ b/perl-install/install_any.pm @@ -232,7 +232,7 @@ sub getAvailableSpace { #- 50mb may be a good choice to avoid almost all problem of insuficient space left... my $minAvailableSize = 50 * sqr(1024); - int (getAvailableSpace_mounted($o->{prefix}) || getAvailableSpace_raw($o->{fstab})) * 512 / 1.07 - $minAvailableSize; + int ((getAvailableSpace_mounted($o->{prefix}) || getAvailableSpace_raw($o->{fstab}) * 512 / 1.07) - $minAvailableSize); } sub getAvailableSpace_mounted { @@ -240,7 +240,7 @@ sub getAvailableSpace_mounted { my $buf = ' ' x 20000; syscall_('statfs', "$prefix/usr", $buf) or return; my (undef, $blocksize, $size, undef, $free, undef) = unpack "L2L4", $buf; - ($free || 1) * $blocksize / 512; + ($free || 1) * $blocksize; } sub getAvailableSpace_raw { my ($fstab) = @_; diff --git a/perl-install/install_steps.pm b/perl-install/install_steps.pm index f299af08d..bdc99a1d1 100644 --- a/perl-install/install_steps.pm +++ b/perl-install/install_steps.pm @@ -240,7 +240,7 @@ sub choosePackages { pkgs::selectPackage($o->{packages}, pkgs::packageByName($o->{packages}, $_) || next) foreach @{$o->{default_packages}}; add2hash_($o, { compssListLevel => $::expert ? 90 : 80 }) unless $::auto_install; - pkgs::setSelectedFromCompssList($o->{compssListLevels}, $packages, $o->{compssListLevel}, $available, $o->{installClass}) if exists $o->{compssListLevel}; + pkgs::setSelectedFromCompssList($o->{compssListLevels}, $packages, $o->{compssListLevel}, $availableCorrected, $o->{installClass}) if exists $o->{compssListLevel}; $availableCorrected; } diff --git a/perl-install/install_steps_interactive.pm b/perl-install/install_steps_interactive.pm index 97618c1d6..8da8c32b5 100644 --- a/perl-install/install_steps_interactive.pm +++ b/perl-install/install_steps_interactive.pm @@ -970,7 +970,7 @@ _("Removable media automounting") => { val => \$o->{useSupermount}, type => 'boo $::expert ? ( _("Clean /tmp at each boot") => { val => \$u->{CLEAN_TMP}, type => 'bool' }, ) : (), - $o->{pcmcia} ? ( + $o->{pcmcia} && $::expert ? ( _("Enable multi profiles") => { val => \$u->{profiles}, type => 'bool' }, ) : ( _("Enable num lock at startup") => { val => \$u->{numlock}, type => 'bool' }, diff --git a/perl-install/pkgs.pm b/perl-install/pkgs.pm index 2560bcaf2..f591e9bbb 100644 --- a/perl-install/pkgs.pm +++ b/perl-install/pkgs.pm @@ -171,7 +171,7 @@ sub extractHeaders($$$) { #- size and correction size functions for packages. my $A = -1.922e-05; my $B = 1.18411; -my $C = 33.2 + 18; #- 18 added cuz of hdlist's +my $C = 23.2; #- doesn't take hdlist's into account as getAvailableSpace will do it. sub correctSize { max($_[0], ($A * $_[0] + $B) * $_[0] + $C) } #- size correction in MB. sub invCorrectSize { min($_[0], (sqrt(sqr($B) + 4 * $A * ($_[0] - $C)) - $B) / 2 / $A) } #- size correction in MB. diff --git a/perl-install/share/list b/perl-install/share/list index 5a966b940..f99a16d82 100644 --- a/perl-install/share/list +++ b/perl-install/share/list @@ -17,6 +17,7 @@ /sbin/mkreiserfs /sbin/raidstart /usr/X11R6/lib/X11/Cards +/usr/X11R6/lib/modules/xf86Wacom.so /usr/bin/bzip2 /usr/bin/extract_archive /usr/bin/perl diff --git a/perl-install/share/list.sparc b/perl-install/share/list.sparc index d35feefa2..45fd1d34b 100644 --- a/perl-install/share/list.sparc +++ b/perl-install/share/list.sparc @@ -70,4 +70,3 @@ /usr/X11R6/bin/XF86_FBDev /usr/X11R6/bin/XF86_Mach64 /usr/X11R6/bin/xmodmap -/usr/X11R6/lib/modules/xf86Wacom.so diff --git a/perl-install/standalone/mousedrake b/perl-install/standalone/mousedrake index c05ad5d99..7ac3b927d 100755 --- a/perl-install/standalone/mousedrake +++ b/perl-install/standalone/mousedrake @@ -43,11 +43,18 @@ mouse::write('', $mouse); modules::write_conf("/etc/conf.modules") if $mouse->{device} eq "usbmouse" && !$::testing; my $f = "/etc/X11/XF86Config"; +my $g = "/etc/X11/XF86Config-4"; substInFile { if (/^Section "Pointer"/ .. /^EndSection/) { s|^(\s*Protocol\s+).*|$1"$mouse->{XMOUSETYPE}"|; s|^(\s*Device\s+).*|$1"/dev/mouse"|; } } $f if -e $f && !$::testing; +substInFile { + if (/^Identifier "Mouse1"/ .. /^EndSection/) { + s|^(\s*Option\s+"Protocol"\s+).*|$1"$mouse->{XMOUSETYPE}"|; + s|^(\s*Option\s+"Device"\s+).*|$1"/dev/mouse"|; + } +} $g if -e $g && !$::testing; $in->exit(0); -- cgit v1.2.1