summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--perl-install/ChangeLog32
-rw-r--r--perl-install/Xconfigurator.pm10
-rw-r--r--perl-install/install2.pm2
-rw-r--r--perl-install/install_steps.pm13
4 files changed, 50 insertions, 7 deletions
diff --git a/perl-install/ChangeLog b/perl-install/ChangeLog
index 152193099..aca2013e9 100644
--- a/perl-install/ChangeLog
+++ b/perl-install/ChangeLog
@@ -1,6 +1,32 @@
-2000-05-19 François Pons <fpons@mandrakesoft.com>
-
- * *.pm: sparc and sparc64 update, a long to do again.
+2000-05-23 François Pons <fpons@mandrakesoft.com>
+
+ * common.pm: update arch to take into account sparc and sparc64. added
+ better_arch and compat_arch function.
+ * silo.pm: fixed adding new kernel automatically.
+ * install2.pm: removed create boot disk stuff for sparc*.
+ * install_steps.pm: added initrd generation for alpha. added ldconfig
+ at end of installation. removed /usr/bin/dumpkeys existence test on
+ sparc*, should be added in the future.
+ * install_steps_interactive.pm: removed supermount for sparc*.
+ * install_steps_gtk.pm: added /dev/kbd device creation and permedia2
+ support for sparc*. removed screen limit of 1024x768.
+ * detect_devices.pm: fixed problem on machine with really no IDE interface.
+ * modules.pm: added support for 32 and 64 bit architectures on sparc*.
+ * install_any.pm: fixed getAvailableSpace_mounted if /usr is not a separate
+ partition.
+ * pkgs.pm: added support for multi-arch rpm file (need for sparc*),
+ fixed correctSize and invCorrectSize to take back a linear approximation
+ above 9Gb approximatively. removed ftp rewind as broken currently.
+ * keyboard.pm: fixed bad list of available keyboard (broke sparc*), fixed
+ globing (removed) against existing '*'.
+ * partition_table.pm: removed support for non SUN partition table, as it
+ may freeze the kernel or may be blanked?
+ * Xconfigurator.pm: take Sun24 server by default on sparc*, add support
+ for permedia2 card (3DLabs server).
+ * share/list.sparc: added perl-5.6.0 for sparc*, fixed for sparc*.
+ * Makefile: added support for modules and modules64 for sparc*.
+ * c/stuff.xs.pm: added kernel_arch function for getting the current true
+ architecture provided by the kernel (uname -m).
2000-05-09 Pixel <pixel@mandrakesoft.com>
diff --git a/perl-install/Xconfigurator.pm b/perl-install/Xconfigurator.pm
index 0d46c73db..bf055b91c 100644
--- a/perl-install/Xconfigurator.pm
+++ b/perl-install/Xconfigurator.pm
@@ -151,6 +151,13 @@ sub cardConfigurationAuto() {
$card->{flags}{needVideoRam} &&= /86c368/;
push @{$card->{lines}}, @{$lines{$card->{identifier}} || []};
}
+ #- take a default on sparc if nothing has been found.
+ if (arch() =~ /^sparc/ && !$card->{server} && !$card->{type}) {
+ local $_ = cat_("/proc/fb");
+ if (/Mach64/) { $card->{server} = "Mach64" }
+ elsif (/Permedia2/) { $card->{server} = "3DLabs" }
+ else { $card->{server} = "Sun24" }
+ }
$card;
}
@@ -169,7 +176,8 @@ sub cardConfiguration(;$$$) {
add2hash($card, { vendor => "Unknown", board => "Unknown" });
$::xf4 = $card->{identifier} =~ /Rage 128/ if !$::expert;
- $card->{prog} = "/usr/X11R6/bin/" . ($::xf4 && $card->{driver} ? 'XFree86' : "XF86_$card->{server}");
+ $card->{prog} = "/usr/X11R6/bin/" . ($::xf4 && $card->{driver} ? 'XFree86' : $card->{server} =~ /Sun (.*)/x ?
+ "Xsun$1" : "XF86_$card->{server}");
-x "$prefix$card->{prog}" or $install && do {
$in->suspend;
diff --git a/perl-install/install2.pm b/perl-install/install2.pm
index b4d4fc0d4..cfe2de197 100644
--- a/perl-install/install2.pm
+++ b/perl-install/install2.pm
@@ -57,7 +57,7 @@ my (%installSteps, @orderedInstallSteps);
configurePrinter => [ __("Configure printer"), 1, 0, '', "doInstallStep" ],
setRootPassword => [ __("Set root password"), 1, 1, '', "formatPartitions" ],
addUser => [ __("Add a user"), 1, 1, '' ],
-arch() !~ /alpha/ ? (
+arch() !~ /alpha|sparc/ ? (
createBootdisk => [ __("Create a bootdisk"), 1, 0, '$::o->{lnx4win} && !$::expert', "doInstallStep" ],
) : (),
setupBootloader => [ __("Install bootloader"), 1, 1, '$::o->{lnx4win} && !$::expert', "doInstallStep" ],
diff --git a/perl-install/install_steps.pm b/perl-install/install_steps.pm
index fc0c42465..c128a6980 100644
--- a/perl-install/install_steps.pm
+++ b/perl-install/install_steps.pm
@@ -335,6 +335,10 @@ Consoles 1,3,4,7 may also contain interesting information";
#- why not? cuz weather is nice today :-) [pixel]
sync(); sync();
+ #- call ldconfig at the end of package installation
+ run_program::rooted($o->{prefix}, "ldconfig");
+
+ #- configure PCMCIA services if needed.
$o->pcmciaConfig();
#- for mandrake_firstime
@@ -825,9 +829,14 @@ sub setupBootloader($) {
};
run_program::rooted($o->{prefix}, "abootconf", $b->{boot}, $b->{part_nb});
+ modules::load('loop');
output "$o->{prefix}/etc/aboot.conf",
- map_index { "$::i:$b->{part_nb}$_ root=$b->{root} $b->{perImageAppend}\n" }
- map { /$o->{prefix}(.*)/ } eval { glob_("$o->{prefix}/boot/vmlinux*") };
+ map_index { -e "$o->{prefix}/boot/initrd-$_->[1]" ?
+ "$::i:$b->{part_nb}$_->[0] root=$b->{root} initrd=/boot/initrd-$_->[1] $b->{perImageAppend}\n" :
+ "$::i:$b->{part_nb}$_->[0] root=$b->{root} $b->{perImageAppend}\n" }
+ map { run_program::rooted($o->{prefix}, "mkinitrd", "-f", "/boot/initrd-$_->[1]", "--ifneeded", $_->[1]) or
+ unlink "$o->{prefix}/boot/initrd-$_->[1]" } grep { $_->[0] && $_->[1] }
+ map { [ m|$o->{prefix}(/boot/vmlinux-(.*))| ] } eval { glob_("$o->{prefix}/boot/vmlinux-*") };
} elsif (arch() =~ /^sparc/) {
silo::install($o->{prefix}, $o->{bootloader});
} else {