summaryrefslogtreecommitdiffstats
path: root/perl-install/standalone
diff options
context:
space:
mode:
authorArnaud Patard <rtp@mageia.org>2011-03-18 21:33:11 +0000
committerArnaud Patard <rtp@mageia.org>2011-03-18 21:33:11 +0000
commit2bfae95a970f4c7284a2484fb967bbf9174c2cc6 (patch)
tree0ee61668e342609cc56f0755d5edd2277e66aef3 /perl-install/standalone
parenteea2f8ef9ddf7e461702d8fda0b8e98e623694c2 (diff)
downloaddrakx-2bfae95a970f4c7284a2484fb967bbf9174c2cc6.tar
drakx-2bfae95a970f4c7284a2484fb967bbf9174c2cc6.tar.gz
drakx-2bfae95a970f4c7284a2484fb967bbf9174c2cc6.tar.bz2
drakx-2bfae95a970f4c7284a2484fb967bbf9174c2cc6.tar.xz
drakx-2bfae95a970f4c7284a2484fb967bbf9174c2cc6.zip
- import stage1/drakxtools mips support
Diffstat (limited to 'perl-install/standalone')
-rwxr-xr-xperl-install/standalone/bootloader-config9
-rwxr-xr-xperl-install/standalone/harddrake23
2 files changed, 11 insertions, 1 deletions
diff --git a/perl-install/standalone/bootloader-config b/perl-install/standalone/bootloader-config
index 1eea36be8..4306a5e44 100755
--- a/perl-install/standalone/bootloader-config
+++ b/perl-install/standalone/bootloader-config
@@ -54,7 +54,14 @@ if ($image) {
}
$image = "/boot/$image" if $image !~ m!^/!;
} elsif ($kernel_version) {
- $image = "/boot/vmlinuz-$kernel_version";
+ # FIXME : test for vmlinux or vmlinuz existence and choose
+ # instead of using arch()
+ if (arch() =~ /mips/) {
+ $image = "/boot/vmlinux-$kernel_version";
+ }
+ else {
+ $image = "/boot/vmlinuz-$kernel_version";
+ }
}
diff --git a/perl-install/standalone/harddrake2 b/perl-install/standalone/harddrake2
index f9905e232..e1a4e99bb 100755
--- a/perl-install/standalone/harddrake2
+++ b/perl-install/standalone/harddrake2
@@ -69,6 +69,8 @@ my %fields =
},
CPU =>
{
+ "system type" => [ "Sytem Type", "Name of the system" ],
+ "BogoMIPS" => [ N("Bogomips"), N("the GNU/Linux kernel needs to run a calculation loop at boot time to initialize a timer counter. Its result is stored as bogomips as a way to \"benchmark\" the cpu.") ],
"bogomips" => [ N("Bogomips"), N("the GNU/Linux kernel needs to run a calculation loop at boot time to initialize a timer counter. Its result is stored as bogomips as a way to \"benchmark\" the cpu.") ],
"cache size" => [ N("Cache size"), N("size of the (second level) cpu cache") ],
"cpu family" => [ N("Cpuid family"), N("family of the cpu (eg: 6 for i686 class)") ],
@@ -83,6 +85,7 @@ my %fields =
"level" => [ N("Level"), N("sub generation of the cpu") ],
"model" => [ N("Model"), N("generation of the cpu (eg: 8 for Pentium III, ...)") ],
"model name" => [ N("Model name"), N("official vendor name of the cpu") ],
+ "cpu model" => [ N("Model name"), N("official vendor name of the cpu") ],
"name" => [ N("Name"), N("the name of the CPU") ],
"processor" => [ N("Processor ID"), N("the number of the processor") ],
"stepping" => [ N("Model stepping"), N("stepping of the cpu (sub model (generation) number)") ],