summaryrefslogtreecommitdiffstats
path: root/perl-install
diff options
context:
space:
mode:
authorPascal Rigaux <pixel@mandriva.com>2002-02-10 23:16:14 +0000
committerPascal Rigaux <pixel@mandriva.com>2002-02-10 23:16:14 +0000
commita1d37f6d5ddc4da5b3d4ce610568f7b7154276ea (patch)
tree04ca9e82f3f182c2a7aedff38c400dd85b216313 /perl-install
parentb78c6c943967f88f88da5157dffd586d5950134f (diff)
downloaddrakx-a1d37f6d5ddc4da5b3d4ce610568f7b7154276ea.tar
drakx-a1d37f6d5ddc4da5b3d4ce610568f7b7154276ea.tar.gz
drakx-a1d37f6d5ddc4da5b3d4ce610568f7b7154276ea.tar.bz2
drakx-a1d37f6d5ddc4da5b3d4ce610568f7b7154276ea.tar.xz
drakx-a1d37f6d5ddc4da5b3d4ce610568f7b7154276ea.zip
in case there is both ata66 (hde) and ata33 hard drives, go to expert
questions directly (it would need a semi_auto asking on which drive the bios boots...)
Diffstat (limited to 'perl-install')
-rw-r--r--perl-install/any.pm4
1 files changed, 3 insertions, 1 deletions
diff --git a/perl-install/any.pm b/perl-install/any.pm
index 6caeef9d7..b6c6542b0 100644
--- a/perl-install/any.pm
+++ b/perl-install/any.pm
@@ -98,7 +98,9 @@ sub setupBootloader {
my $semi_auto = !$::expert && arch() !~ /ia64/;
my $ask_per_entries = $::expert || $more > 1;
$automatic = 0 if arch() =~ /ppc/; #- no auto for PPC yet
- if ((grep { $_->{device} =~ /^sd/ } @$hds) && (grep { $_->{device} =~ /^hd/ } @$hds)) {
+ if ((grep { $_->{device} =~ /^sd/ } @$hds) && (grep { $_->{device} =~ /^hd/ } @$hds) ||
+ (grep { $_->{device} =~ /^hd[fghi]/ } @$hds) && (grep { $_->{device} =~ /^hd[abcd]/ } @$hds) ||
+ ) {
$automatic = $semi_auto = 0;
#- full expert questions when there is 2 kind of disks
#- it would need a semi_auto asking on which drive the bios boots...
d>bin0 -> 344 bytes-rw-r--r--perl-install/share/rpm-semiselected.pngbin0 -> 238 bytes-rw-r--r--perl-install/share/rpm-unselected.pngbin0 -> 123 bytes-rw-r--r--perl-install/share/themes/blueHeart-button_def.pngbin0 -> 2735 bytes-rw-r--r--perl-install/share/themes/focus.pngbin0 -> 345 bytes-rw-r--r--perl-install/share/themes/marble3d-bg1.pngbin0 -> 9693 bytes-rw-r--r--perl-install/share/themes/marble3d-button1.pngbin0 -> 3454 bytes-rw-r--r--perl-install/share/themes/marble3d-button2.pngbin0 -> 3840 bytes-rw-r--r--perl-install/share/themes/marble3d-button4.pngbin0 -> 2936 bytes-rw-r--r--perl-install/share/themes/marble3d-button_def.pngbin0 -> 4888 bytes-rw-r--r--perl-install/share/themes/marble3d-check1.pngbin0 -> 180 bytes-rw-r--r--perl-install/share/themes/marble3d-check2.pngbin0 -> 231 bytes-rw-r--r--perl-install/share/themes/mdk-button1.pngbin0 -> 628 bytes-rw-r--r--perl-install/share/themes/mdk-button4.pngbin0 -> 625 bytes
21 files changed, 0 insertions, 0 deletions
diff --git a/perl-install/share/ftin.png b/perl-install/share/ftin.png
new file mode 100644
index 000000000..3cec3c194
--- /dev/null
+++ b/perl-install/share/ftin.png
Binary files differ
diff --git a/perl-install/share/ftout.png b/perl-install/share/ftout.png
new file mode 100644
index 000000000..d821716eb
--- /dev/null
+++ b/perl-install/share/ftout.png
Binary files differ
diff --git a/perl-install/share/help.png b/perl-install/share/help.png
new file mode 100644
index 000000000..418aebe1a
--- /dev/null
+++ b/perl-install/share/help.png
Binary files differ
diff --git a/perl-install/share/logo-mandrake.png b/perl-install/share/logo-mandrake.png
new file mode 100644
index 000000000..e1c32cad9
--- /dev/null
+++ b/perl-install/share/logo-mandrake.png
Binary files differ
diff --git a/perl-install/share/reload.png b/perl-install/share/reload.png
new file mode 100644
index 000000000..26d503283
--- /dev/null
+++ b/perl-install/share/reload.png
Binary files differ
diff --git a/perl-install/share/rpm-base.png b/perl-install/share/rpm-base.png
new file mode 100644
index 000000000..c74fec0ff
--- /dev/null
+++ b/perl-install/share/rpm-base.png
Binary files differ
diff --git a/perl-install/share/rpm-installed.png b/perl-install/share/rpm-installed.png
new file mode 100644
index 000000000..10a032fd0
--- /dev/null
+++ b/perl-install/share/rpm-installed.png
Binary files differ
diff --git a/perl-install/share/rpm-selected.png b/perl-install/share/rpm-selected.png
new file mode 100644
index 000000000..49b225b93
--- /dev/null
+++ b/perl-install/share/rpm-selected.png
Binary files differ
diff --git a/perl-install/share/rpm-semiselected.png b/perl-install/share/rpm-semiselected.png
new file mode 100644
index 000000000..c026805bf
--- /dev/null
+++ b/perl-install/share/rpm-semiselected.png
Binary files differ
diff --git a/perl-install/share/rpm-unselected.png b/perl-install/share/rpm-unselected.png
new file mode 100644
index 000000000..221acbceb
--- /dev/null
+++ b/perl-install/share/rpm-unselected.png
Binary files differ
diff --git a/perl-install/share/themes/blueHeart-button_def.png b/perl-install/share/themes/blueHeart-button_def.png
new file mode 100644
index 000000000..b35781416
--- /dev/null
+++ b/perl-install/share/themes/blueHeart-button_def.png
Binary files differ
diff --git a/perl-install/share/themes/focus.png b/perl-install/share/themes/focus.png
new file mode 100644
index 000000000..70afb1797
--- /dev/null
+++ b/perl-install/share/themes/focus.png
Binary files differ
diff --git a/perl-install/share/themes/marble3d-bg1.png b/perl-install/share/themes/marble3d-bg1.png
new file mode 100644
index 000000000..b4e1afd66
--- /dev/null
+++ b/perl-install/share/themes/marble3d-bg1.png
Binary files differ
diff --git a/perl-install/share/themes/marble3d-button1.png b/perl-install/share/themes/marble3d-button1.png
new file mode 100644
index 000000000..9119ac89c
--- /dev/null
+++ b/perl-install/share/themes/marble3d-button1.png
Binary files differ
diff --git a/perl-install/share/themes/marble3d-button2.png b/perl-install/share/themes/marble3d-button2.png
new file mode 100644
index 000000000..70696538c
--- /dev/null
+++ b/perl-install/share/themes/marble3d-button2.png
Binary files differ
diff --git a/perl-install/share/themes/marble3d-button4.png b/perl-install/share/themes/marble3d-button4.png
new file mode 100644
index 000000000..7b6aae23a
--- /dev/null
+++ b/perl-install/share/themes/marble3d-button4.png
Binary files differ
diff --git a/perl-install/share/themes/marble3d-button_def.png b/perl-install/share/themes/marble3d-button_def.png
new file mode 100644
index 000000000..4bd67d0d9
--- /dev/null
+++ b/perl-install/share/themes/marble3d-button_def.png
Binary files differ
diff --git a/perl-install/share/themes/marble3d-check1.png b/perl-install/share/themes/marble3d-check1.png
new file mode 100644
index 000000000..f3c31d09c
--- /dev/null
+++ b/perl-install/share/themes/marble3d-check1.png
Binary files differ
diff --git a/perl-install/share/themes/marble3d-check2.png b/perl-install/share/themes/marble3d-check2.png
new file mode 100644
index 000000000..5261472f9
--- /dev/null
+++ b/perl-install/share/themes/marble3d-check2.png
Binary files differ
diff --git a/perl-install/share/themes/mdk-button1.png b/perl-install/share/themes/mdk-button1.png
new file mode 100644
index 000000000..9d5f701c6
--- /dev/null
+++ b/perl-install/share/themes/mdk-button1.png
Binary files differ
diff --git a/perl-install/share/themes/mdk-button4.png b/perl-install/share/themes/mdk-button4.png
new file mode 100644
index 000000000..c93837c08
--- /dev/null
+++ b/perl-install/share/themes/mdk-button4.png
Binary files differ