summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFrancois Pons <fpons@mandriva.com>2000-05-25 11:22:16 +0000
committerFrancois Pons <fpons@mandriva.com>2000-05-25 11:22:16 +0000
commita5cbe2370666644c7728729ba948c7a6336566b8 (patch)
treeb75de99178b83fd925a0e9e81808cf2cc11be791
parent3817c0ae5ac9d2bd27f74d62cefb1336b6088657 (diff)
downloaddrakx-a5cbe2370666644c7728729ba948c7a6336566b8.tar
drakx-a5cbe2370666644c7728729ba948c7a6336566b8.tar.gz
drakx-a5cbe2370666644c7728729ba948c7a6336566b8.tar.bz2
drakx-a5cbe2370666644c7728729ba948c7a6336566b8.tar.xz
drakx-a5cbe2370666644c7728729ba948c7a6336566b8.zip
*** empty log message ***
-rw-r--r--perl-install/ChangeLog11
-rw-r--r--perl-install/commands.pm2
-rw-r--r--perl-install/install2.pm4
-rw-r--r--perl-install/install_steps_interactive.pm13
-rw-r--r--perl-install/modules.pm11
5 files changed, 31 insertions, 10 deletions
diff --git a/perl-install/ChangeLog b/perl-install/ChangeLog
index df10d286a..9fe9eb570 100644
--- a/perl-install/ChangeLog
+++ b/perl-install/ChangeLog
@@ -1,3 +1,14 @@
+2000-05-25 François Pons <fpons@mandrakesoft.com>
+
+ * silo.pm: added configure_entry to try creating an initrd for an image
+ entry in bootloader. fixed wrong usage of run_programm::rooted with 2>.
+ * commands.pm: fixed insmod command to take modules64.cz* on sparc*
+ * install2.pm: removed create boot disk and create auto install disk on
+ sparc*. force writing of /etc/conf.modules for step setupBootloader.
+ * install_steps_interactive.pm: added missing $prefix for glob_. call
+ configure_entry in setupSILO.
+ * modules.pm: updated alias for sparc*.
+
2000-05-24 François Pons <fpons@mandrakesoft.com>
* partition_tabel.pm: fixed wrong detection of DOS partition on sparc*.
diff --git a/perl-install/commands.pm b/perl-install/commands.pm
index ae4384b34..1bc534897 100644
--- a/perl-install/commands.pm
+++ b/perl-install/commands.pm
@@ -423,7 +423,7 @@ sub insmod {
$_ = $1 if m@.*/([^/]*)\.o@;
unless (-r ($f = "/lib/modules/$_.o")) {
$f = "/tmp/$_.o";
- my $cz = "/lib/modules.cz"; -e $cz or $cz .= "2";
+ my $cz = "/lib/modules" . (arch() eq 'sparc64' && "64") . ".cz"; -e $cz or $cz .= "2";
if (-e $cz) {
run_program::run("extract_archive $cz /tmp $_.o");
} elsif (-e "/lib/modules.cpio.bz2") {
diff --git a/perl-install/install2.pm b/perl-install/install2.pm
index cfe2de197..15566d0c7 100644
--- a/perl-install/install2.pm
+++ b/perl-install/install2.pm
@@ -62,7 +62,9 @@ arch() !~ /alpha|sparc/ ? (
) : (),
setupBootloader => [ __("Install bootloader"), 1, 1, '$::o->{lnx4win} && !$::expert', "doInstallStep" ],
configureX => [ __("Configure X"), 1, 1, '', ["formatPartitions", "setupBootloader"] ],
+arch() !~ /sparc/ ? (
generateAutoInstFloppy => [ __("Auto install floppy"), 1, 1, '!$::expert || $o->{lnx4win}', "doInstallStep" ],
+) : (),
exitInstall => [ __("Exit install"), 0, 0, '$::beginner' ],
);
for (my $i = 0; $i < @installSteps; $i += 2) {
@@ -489,6 +491,8 @@ sub createBootdisk {
sub setupBootloader {
return if $::g_auto_install;
+ modules::write_conf("$o->{prefix}/etc/conf.modules");
+
$o->setupBootloaderBefore if $_[1] == 1;
$o->setupBootloader($_[1] - 1);
diff --git a/perl-install/install_steps_interactive.pm b/perl-install/install_steps_interactive.pm
index 464ac7f2b..eac2a20f9 100644
--- a/perl-install/install_steps_interactive.pm
+++ b/perl-install/install_steps_interactive.pm
@@ -854,11 +854,11 @@ 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 { glob_("/boot/vmlinuz*") } ] },
-_("Partition") => { val => \$e->{partition}, list => [ map { ("/dev/$_->{device}" =~ /\D*(\d*)/)[0] || 1} @{$o->{fstab}} ], not_edit => !$::expert },
-_("Root") => { val => \$e->{root}, list => [ map { "/dev/$_->{device}" } @{$o->{fstab}} ], not_edit => !$::expert },
+_("Image") => { val => \$e->{kernel_or_dev}, list => [ eval { glob_("$o->{prefix}/boot/vmlinuz*") } ] },
+_("Partition") => { val => \$e->{partition}, list => [ map { ("$o->{prefix}/dev/$_->{device}" =~ /\D*(\d*)/)[0] || 1} @{$o->{fstab}} ], not_edit => !$::expert },
+_("Root") => { val => \$e->{root}, list => [ map { "$o->{prefix}/dev/$_->{device}" } @{$o->{fstab}} ], not_edit => !$::expert },
_("Append") => \$e->{append},
-_("Initrd") => { val => \$e->{initrd}, list => [ eval { glob_("/boot/initrd*") } ] },
+_("Initrd") => { val => \$e->{initrd}, list => [ eval { glob_("$o->{prefix}/boot/initrd*") } ] },
_("Read-write") => { val => \$e->{'read-write'}, type => 'bool' }
);
@l = @l[0..7] unless $::expert;
@@ -879,8 +879,9 @@ _("Default") => { val => \$default, type => 'bool' },
0;
})) {
$b->{default} = $old_default || $default ? $default && $e->{label} : $b->{default};
-
- push @{$b->{entries}}, $e if $c eq "Add";
+ require silo;
+ silo::configure_entry($o->{prefix}, $e);
+ $c eq 'Add' and push @{$b->{entries}}, $e;
} else {
@{$b->{entries}} = grep { $_ != $e } @{$b->{entries}};
}
diff --git a/perl-install/modules.pm b/perl-install/modules.pm
index 58979b307..69b9a884e 100644
--- a/perl-install/modules.pm
+++ b/perl-install/modules.pm
@@ -516,9 +516,14 @@ sub write_conf {
sub read_stage1_conf {
add2hash(\%conf, read_conf($_[0], \$scsi));
- $conf{parport_lowlevel}{alias} ||= "parport_pc";
- $conf{pcmcia_core}{"pre-install"} ||= "CARDMGR_OPTS=-f /etc/rc.d/init.d/pcmcia start";
- $conf{plip}{"pre-install"} ||= "modprobe parport_pc ; echo 7 > /proc/parport/0/irq";
+ if (arch() =~ /sparc/) {
+ $conf{parport_lowlevel}{alias} ||= "parport_ax";
+ $conf{plip}{"pre-install"} ||= "modprobe parport_ax ; echo 7 > /proc/parport/0/irq"; #- TOCHECK
+ } else {
+ $conf{parport_lowlevel}{alias} ||= "parport_pc";
+ $conf{pcmcia_core}{"pre-install"} ||= "CARDMGR_OPTS=-f /etc/rc.d/init.d/pcmcia start";
+ $conf{plip}{"pre-install"} ||= "modprobe parport_pc ; echo 7 > /proc/parport/0/irq";
+ }
}
sub load_thiskind($;&$) {