summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorStew Benedict <stewb@mandriva.org>2005-02-18 19:53:16 +0000
committerStew Benedict <stewb@mandriva.org>2005-02-18 19:53:16 +0000
commitefda5d58894ee4ff5e07bc5b98a428bf243356cd (patch)
treef31996d13eb9d3936b9e486314cd29f01ef6ab11
parentb8fa5fa2b0072ebd19528bb0522553499ee948d4 (diff)
downloaddrakx-backup-do-not-use-efda5d58894ee4ff5e07bc5b98a428bf243356cd.tar
drakx-backup-do-not-use-efda5d58894ee4ff5e07bc5b98a428bf243356cd.tar.gz
drakx-backup-do-not-use-efda5d58894ee4ff5e07bc5b98a428bf243356cd.tar.bz2
drakx-backup-do-not-use-efda5d58894ee4ff5e07bc5b98a428bf243356cd.tar.xz
drakx-backup-do-not-use-efda5d58894ee4ff5e07bc5b98a428bf243356cd.zip
Detect XBox, don't probe for floppy on XBox.
-rw-r--r--perl-install/detect_devices.pm6
1 files changed, 5 insertions, 1 deletions
diff --git a/perl-install/detect_devices.pm b/perl-install/detect_devices.pm
index 165b7a6b8..7fb9575cd 100644
--- a/perl-install/detect_devices.pm
+++ b/perl-install/detect_devices.pm
@@ -56,7 +56,7 @@ sub floppies() {
my @fds;
my @dmis = dmidecode();
# do not try to load floppy if there's no floppy drive:
- if ($::isInstall || !@dmis || find { $_->{'Internal Reference Designator'} =~ /^(FLOPPY|FDD)$/ && $_->{name} eq 'Port Connector' } @dmis) {
+ if (!is_xbox() && ($::isInstall || !@dmis || find { $_->{'Internal Reference Designator'} =~ /^(FLOPPY|FDD)$/ && $_->{name} eq 'Port Connector' } @dmis)) {
eval { modules::load("floppy") if $::isInstall };
if (!$@) {
@fds = map {
@@ -784,6 +784,10 @@ sub get_mac_generation() {
cat_('/proc/cpuinfo') =~ /^pmac-generation\s*:\s*(.*)/m ? $1 : "Unknown Generation";
}
+sub is_xbox() {
+ return any { $_->{vendor} . $_->{id} == hex('10de') . hex('02a5') } detect_devices::pci_probe();
+}
+
sub hasSMP() {
return if $::testing;
c::detectSMP() || any { /\bProcessor #(\d+)\s+(\S*)/ && $1 > 0 && $2 ne 'invalid' } syslog();