summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorStew Benedict <stewb@mandriva.org>2005-03-15 19:56:26 +0000
committerStew Benedict <stewb@mandriva.org>2005-03-15 19:56:26 +0000
commit6026ccf19a651838544a1fd6ecddf6310d00f6fb (patch)
treec7b35371f402e085b8dc0d0044f5c9be3dd3bc00
parent80cc3f5b70913861c00475432ec9d1bab05ec2b0 (diff)
downloaddrakx-6026ccf19a651838544a1fd6ecddf6310d00f6fb.tar
drakx-6026ccf19a651838544a1fd6ecddf6310d00f6fb.tar.gz
drakx-6026ccf19a651838544a1fd6ecddf6310d00f6fb.tar.bz2
drakx-6026ccf19a651838544a1fd6ecddf6310d00f6fb.tar.xz
drakx-6026ccf19a651838544a1fd6ecddf6310d00f6fb.zip
Install kernel-xbox on XBOX, bypass bootloader setup and eject call
-rw-r--r--perl-install/any.pm3
-rw-r--r--perl-install/install_any.pm1
-rw-r--r--perl-install/pkgs.pm3
3 files changed, 5 insertions, 2 deletions
diff --git a/perl-install/any.pm b/perl-install/any.pm
index 5bc15eb03..f39ab8f65 100644
--- a/perl-install/any.pm
+++ b/perl-install/any.pm
@@ -130,7 +130,7 @@ sub setupBootloader {
sub installBootloader {
my ($in, $b, $all_hds) = @_;
-
+ return if is_xbox();
install_acpi_pkgs($in->do_pkgs, $b);
eval { run_program::rooted($::prefix, 'echo | lilo -u') } if $::isInstall && !$::o->{isUpgrade} && -e "$::prefix/etc/lilo.conf" && glob("$::prefix/boot/boot.*");
@@ -252,6 +252,7 @@ sub setupBootloader__mbr_or_not {
sub setupBootloader__general {
my ($in, $b, $all_hds, $fstab, $security) = @_;
+ return if is_xbox();
my @method_choices = bootloader::method_choices($fstab);
my $prev_force_acpi = my $force_acpi = bootloader::get_append_with_key($b, 'acpi') !~ /off|ht/;
my $prev_force_noapic = my $force_noapic = bootloader::get_append_simple($b, 'noapic');
diff --git a/perl-install/install_any.pm b/perl-install/install_any.pm
index cb5562244..b8073dac3 100644
--- a/perl-install/install_any.pm
+++ b/perl-install/install_any.pm
@@ -914,6 +914,7 @@ sub ejectCdrom {
#- D state if the cdrom is already removed
eval { fs::umount($o_mountpoint) };
$@ and warnAboutFilesStillOpen();
+ return if is_xbox();
eval {
my $dev = detect_devices::tryOpen($cdrom);
ioctl($dev, c::CDROMEJECT(), 1) if ioctl($dev, c::CDROM_DRIVE_STATUS(), 0) == c::CDS_DISC_OK();
diff --git a/perl-install/pkgs.pm b/perl-install/pkgs.pm
index b30ad3785..aa9e54d11 100644
--- a/perl-install/pkgs.pm
+++ b/perl-install/pkgs.pm
@@ -176,7 +176,7 @@ sub packageById {
sub analyse_kernel_name {
my $kernels = join('|', map { "-$_" }
'(p3|i586|i686)-(up|smp)-(1GB|4GB|64GB)',
- qw(enterprise secure smp multimedia multimedia-smp),
+ qw(enterprise secure smp multimedia multimedia-smp xbox),
);
my @l = $_[0] =~ /kernel[^\-]*($kernels)?(-([^\-]+))?$/ or return;
$l[0], $l[-1];
@@ -205,6 +205,7 @@ sub bestKernelPackage {
@kernels = @l;
}
my @prefered_exts =
+ is_xbox() ? '-xbox' :
detect_devices::is_i586() ? '-i586-up-1GB' :
detect_devices::BIGMEM() ? ('-enterprise', '-smp') :
detect_devices::hasSMP() ? '-smp' :