diff options
| author | Olivier Blin <oblin@mandriva.org> | 2005-08-05 04:23:39 +0000 |
|---|---|---|
| committer | Olivier Blin <oblin@mandriva.org> | 2005-08-05 04:23:39 +0000 |
| commit | 89a14b9204e0caad6d143949e0ea9c4cf2173df9 (patch) | |
| tree | 519b1c93edb0466e653010a6b5faa993c93c86cb /perl-install/any.pm | |
| parent | 6d1a9d2a8eb719e5ff0e3ea3517b3e59075f306c (diff) | |
| download | drakx-backup-do-not-use-89a14b9204e0caad6d143949e0ea9c4cf2173df9.tar drakx-backup-do-not-use-89a14b9204e0caad6d143949e0ea9c4cf2173df9.tar.gz drakx-backup-do-not-use-89a14b9204e0caad6d143949e0ea9c4cf2173df9.tar.bz2 drakx-backup-do-not-use-89a14b9204e0caad6d143949e0ea9c4cf2173df9.tar.xz drakx-backup-do-not-use-89a14b9204e0caad6d143949e0ea9c4cf2173df9.zip | |
move is_xbox from common to detect_devices
Diffstat (limited to 'perl-install/any.pm')
| -rw-r--r-- | perl-install/any.pm | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/perl-install/any.pm b/perl-install/any.pm index 8823bbca3..87454ef10 100644 --- a/perl-install/any.pm +++ b/perl-install/any.pm @@ -132,7 +132,7 @@ sub setupBootloader { sub installBootloader { my ($in, $b, $all_hds) = @_; - return if is_xbox(); + return if detect_devices::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.*"); @@ -254,7 +254,7 @@ sub setupBootloader__mbr_or_not { sub setupBootloader__general { my ($in, $b, $all_hds, $fstab, $security) = @_; - return if is_xbox(); + return if detect_devices::is_xbox(); my @method_choices = bootloader::method_choices($all_hds); 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'); |