diff options
| -rwxr-xr-x | make_boot_img | 19 | ||||
| -rw-r--r-- | perl-install/ChangeLog | 11 | ||||
| -rw-r--r-- | perl-install/install_steps_interactive.pm | 4 | ||||
| -rw-r--r-- | perl-install/install_steps_newt.pm | 2 | ||||
| -rw-r--r-- | perl-install/modules.pm | 9 | ||||
| -rw-r--r-- | perl-install/pkgs.pm | 2 | ||||
| -rw-r--r-- | perl-install/sbus_probing/main.pm | 3 | ||||
| -rw-r--r-- | perl-install/share/diskdrake.rc | 1 | ||||
| -rwxr-xr-x | update_kernel | 2 |
9 files changed, 36 insertions, 17 deletions
diff --git a/make_boot_img b/make_boot_img index 49abdd55e..601c70992 100755 --- a/make_boot_img +++ b/make_boot_img @@ -5,6 +5,7 @@ use Config; Config->import; my ($arch) = $Config{archname} =~ /(.*)-/; +my $corporate = $ENV{CORPORATE} && " corporate"; #- use this for building a corporate version. ($img, $type) = @ARGV; @@ -188,36 +189,36 @@ image[sun4c,sun4d,sun4m]=/$boot/vmlinux label=linux alias=install initrd=/$boot/live.rdz - append=\"ramdisk_size=32000\" + append=\"ramdisk_size=32000$corporate\" image[sun4c,sun4d,sun4m]=/$boot/vmlinux label=text initrd=/$boot/live.rdz - append=\"ramdisk_size=32000 text\" + append=\"ramdisk_size=32000 text$corporate\" image[sun4c,sun4d,sun4m]=/$boot/vmlinux label=expert initrd=/$boot/live.rdz - append=\"ramdisk_size=32000 expert\" + append=\"ramdisk_size=32000 expert$corporate\" image[sun4c,sun4d,sun4m]=/$boot/vmlinux label=ks initrd=/$boot/live.rdz - append=\"ramdisk_size=32000 ks\" + append=\"ramdisk_size=32000 ks$corporate\" image[sun4u]=/$boot/vmlinux64 label=linux alias=install initrd=/$boot/live64.rdz - append=\"ramdisk_size=32000\" + append=\"ramdisk_size=32000$corporate\" image[sun4u]=/$boot/vmlinux64 label=text initrd=/$boot/live64.rdz - append=\"ramdisk_size=32000 text\" + append=\"ramdisk_size=32000 text$corporate\" image[sun4u]=/$boot/vmlinux64 label=expert initrd=/$boot/live64.rdz - append=\"ramdisk_size=32000 expert\" + append=\"ramdisk_size=32000 expert$corporate\" image[sun4u]=/$boot/vmlinux64 label=ks initrd=/$boot/live64.rdz - append=\"ramdisk_size=32000 ks\" + append=\"ramdisk_size=32000 ks$corporate\" "); output("$dir/$boot/README", " @@ -258,7 +259,7 @@ read-write image=/vmlinux$I.gz label=linux initrd=/$type.rdz - append=ramdisk_size=32000 $ltype + append=ramdisk_size=32000 $ltype$corporate "); _ "genromfs -d $dir -f /dev/ram -A 2048,/.. -a 512 -V \'DrakX boot disk\'"; _ "$sudo mount -t romfs /dev/ram $mnt"; diff --git a/perl-install/ChangeLog b/perl-install/ChangeLog index 5ea947211..76c2f6415 100644 --- a/perl-install/ChangeLog +++ b/perl-install/ChangeLog @@ -1,3 +1,14 @@ +2000-06-07 François Pons <fpons@mandrakesoft.com> + + * diskdrake.pm: added SunOS partition as blue for diskdrake. + * install_steps_interactive.pm: make sure of no division by zero may + happen. + * install_steps_newt.pm: added WARNING for fdisk on sparc*. + * modules.pm: make sure of loading sd_mod module after any scsi module. + * sbus_probing/main.pm: insmod openprom before trying sbus probing. + * pkgs.pm: corrected by use of parabolic solution for size approximation. + * silo.pm: try with "silo -p 2 -t" if "silo -t" has failed due to bad probe. + 2000-06-05 Pablo Saratxaga <pablo@mandrakesoft.com> * install_steps.pm,lang.pm: added load_console_font, to load the diff --git a/perl-install/install_steps_interactive.pm b/perl-install/install_steps_interactive.pm index 93ee9002a..7ea888904 100644 --- a/perl-install/install_steps_interactive.pm +++ b/perl-install/install_steps_interactive.pm @@ -289,7 +289,7 @@ sub choosePackages { my @l = values %{$packages->[0]}; my @flags = map { pkgs::packageFlagSelected($_) } @l; pkgs::setSelectedFromCompssList($o->{compssListLevels}, $packages, $min_mark, 0, $o->{installClass}); - my $max_size = pkgs::selectedSize($packages); + my $max_size = 1 + pkgs::selectedSize($packages); #- avoid division by zero. mapn { pkgs::packageSetFlagSelected(@_) } \@l, \@flags; #- if (!$::beginner && $max_size > $availableC) { @@ -1165,7 +1165,7 @@ sub load_thiskind { sub setup_thiskind { my ($o, $type, $auto, $at_least_one) = @_; - return if arch() eq "ppc"; + return if arch() eq "ppc"; my @l; my $allow_probe = !$::expert || $o->ask_yesorno('', _("Try to find %s devices?", "PCI" . (arch() =~ /sparc/ && "/SBUS")), 1); diff --git a/perl-install/install_steps_newt.pm b/perl-install/install_steps_newt.pm index 015de1c05..4cc5fd9a6 100644 --- a/perl-install/install_steps_newt.pm +++ b/perl-install/install_steps_newt.pm @@ -42,6 +42,8 @@ sub doPartitionDisks($$) { print _("You can now partition your %s hard drive When you are done, don't forget to save using `w'", $_->{device}); + arch() =~ /sparc/ and print +_("\nBE CAREFULL NOT TO USE CYLINDER 0 ELSE YOUR PARTITION TABLE WILL BE DESTROYED!"); print "\n\n"; my $pid = fork or exec "fdisk", devices::make($_->{device}); waitpid($pid, 0); diff --git a/perl-install/modules.pm b/perl-install/modules.pm index 6eb380929..c1bdb2cfc 100644 --- a/perl-install/modules.pm +++ b/perl-install/modules.pm @@ -127,13 +127,13 @@ arch() =~ /^sparc/ ? ( "sim710" => "sim710", "sym53c416" => "sym53c416", "tmscsim" => "tmscsim", + "scsi_mod" => "scsi_mod", ), "aic7xxx" => "Adaptec 2740, 2840, 2940", "ncr53c8xx" => "NCR 53C8xx PCI", # "pci2000" => "Perceptive Solutions PCI-2000", # TODO "qlogicisp" => "Qlogic ISP", "sym53c8xx" => "Symbios 53c8xx", - "scsi_mod" => "scsi_mod", "sd_mod" => "sd_mod", "ide-mod" => "ide-mod", "ide-probe" => "ide-probe", @@ -388,7 +388,10 @@ sub load { if ($type) { add_alias('usb-interface', $name) if $type =~ /SERIAL_USB/i; - add_alias('scsi_hostadapter', $name) if $type eq "scsi" || $type eq $type_aliases{scsi}; + if ($type eq "scsi" || $type eq $type_aliases{scsi}) { + add_alias('scsi_hostadapter', $name); + load("sd_mod"); + } } $conf{$name}{options} = join " ", @options if @options; } @@ -541,8 +544,6 @@ sub load_thiskind($;&$) { my @devs = (@pcidevs, @sbusdevs, @pcmciadevs); - load("sd_mod") if arch() !~ /sparc/ && $type eq 'scsi' && @devs; - my %devs; foreach (@devs) { my ($text, $mod) = @$_; pci_probing::main::check($mod) or next; diff --git a/perl-install/pkgs.pm b/perl-install/pkgs.pm index 60b856b83..dff11bea2 100644 --- a/perl-install/pkgs.pm +++ b/perl-install/pkgs.pm @@ -191,7 +191,7 @@ sub extractHeaders($$$) { my $A = -1.922e-05; my $B = 1.18411; my $C = 23.2; #- doesn't take hdlist's into account as getAvailableSpace will do it. -my $D = (sqrt(sqr($B - 1) - 4 * $A * $C) - ($B - 1)) / 2 / $A; +my $D = (-sqrt(sqr($B - 1) - 4 * $A * $C) - ($B - 1)) / 2 / $A; #- $A is negative so a positive solution is with - sqrt ... sub correctSize { $_[0] < $D ? ($A * $_[0] + $B) * $_[0] + $C : $_[0] } #- size correction in MB. sub invCorrectSize { $_[0] < $D ? (sqrt(sqr($B) + 4 * $A * ($_[0] - $C)) - $B) / 2 / $A : $_[0]; } #- size correction in MB. diff --git a/perl-install/sbus_probing/main.pm b/perl-install/sbus_probing/main.pm index e5c3f1596..b1fce96f7 100644 --- a/perl-install/sbus_probing/main.pm +++ b/perl-install/sbus_probing/main.pm @@ -2,6 +2,7 @@ package sbus_probing::main; use c; use log; +use modules; my %sbus_table_network = ( hme => [ "Sun Happy Meal Ethernet", "sunhme" ], @@ -133,6 +134,7 @@ sub check { sub probe($) { my ($type) = @_; + eval { modules::load("openprom") }; my $root_node = c::prom_open(); my @l; @@ -145,6 +147,7 @@ sub probe($) { sub matching_desc($;$) { my ($regexp) = @_; + eval { modules::load("openprom") }; my $root_node = c::prom_open(); my @l; diff --git a/perl-install/share/diskdrake.rc b/perl-install/share/diskdrake.rc index e83ed1025..f826d04a9 100644 --- a/perl-install/share/diskdrake.rc +++ b/perl-install/share/diskdrake.rc @@ -31,6 +31,7 @@ widget "*Ext2*" style "red" widget "*Linux swap*" style "green" widget "*Swap*" style "green" widget "*FAT*" style "blue" +widget "*SunOS*" style "blue" widget "*NT NTFS*" style "blue" widget "*Empty*" style "white" widget "*Other*" style "font" diff --git a/update_kernel b/update_kernel index 28f959cf8..9a55599b8 100755 --- a/update_kernel +++ b/update_kernel @@ -1,6 +1,6 @@ #!/bin/bash -KERNEL_BOOT_PATH="kernel" +KERNEL_BOOT_PATH="kernel64" function f() { v=`perl -Iperl-install -Mmodules -e "print qq(\\$_.o\n) foreach modules::module_of_type(\"$1\")"` |