diff options
| -rw-r--r-- | mdk-stage1/NEWS | 1 | ||||
| -rw-r--r-- | mdk-stage1/probing.c | 7 | ||||
| -rwxr-xr-x | mdk-stage1/update-pci-ids.pl | 3 | ||||
| -rw-r--r-- | perl-install/NEWS | 1 | ||||
| -rw-r--r-- | perl-install/harddrake/data.pm | 3 | ||||
| -rw-r--r-- | perl-install/install/NEWS | 1 | ||||
| -rw-r--r-- | perl-install/install/steps.pm | 5 | ||||
| -rw-r--r-- | perl-install/install/steps_interactive.pm | 4 | ||||
| -rw-r--r-- | perl-install/modules.pm | 6 | ||||
| -rw-r--r-- | perl-install/modules/interactive.pm | 4 | ||||
| -rwxr-xr-x | perl-install/standalone/bootloader-config | 13 |
11 files changed, 13 insertions, 35 deletions
diff --git a/mdk-stage1/NEWS b/mdk-stage1/NEWS index 7b5c58cab..792a2883c 100644 --- a/mdk-stage1/NEWS +++ b/mdk-stage1/NEWS @@ -1,3 +1,4 @@ +- Remove probing of disk/ide modules (obsolete since kernel 5.14) - Sync with kernel 6.18 2.63 diff --git a/mdk-stage1/probing.c b/mdk-stage1/probing.c index f956bb348..d5c175746 100644 --- a/mdk-stage1/probing.c +++ b/mdk-stage1/probing.c @@ -187,9 +187,7 @@ void probing_detect_devices() struct pciusb_entry *e = &entries.entries[i]; #ifndef DISABLE_PCIADAPTERS #ifndef DISABLE_MEDIAS - if (add_detected_device_if_match(e, medias_ide_pci_modules, medias_ide_pci_modules_len)) - continue; - if (add_detected_device_if_match(e, medias_other_pci_modules, medias_other_pci_modules_len)) + if (add_detected_device_if_match(e, medias_pci_modules, medias_pci_modules_len)) continue; #endif @@ -366,8 +364,7 @@ void probe_that_type(enum driver_type type, enum media_bus bus __attribute__ ((u if (already_probed_media_adapters) break; already_probed_media_adapters = 1; - probe_pci_modules(type, medias_ide_pci_modules, medias_ide_pci_modules_len); - probe_pci_modules(type, medias_other_pci_modules, medias_other_pci_modules_len); + probe_pci_modules(type, medias_pci_modules, medias_pci_modules_len); break; #endif #ifndef DISABLE_NETWORK diff --git a/mdk-stage1/update-pci-ids.pl b/mdk-stage1/update-pci-ids.pl index 1b084ea80..cfab92bef 100755 --- a/mdk-stage1/update-pci-ids.pl +++ b/mdk-stage1/update-pci-ids.pl @@ -7,8 +7,7 @@ use MDK::Common; my %t = ( network => 'network/main|gigabit|pcmcia|virtual|wireless', - medias_ide => 'disk/ide', - medias_other => 'disk/scsi|hardware_raid|sata|virtual bus/firewire', + medias => 'disk/scsi|hardware_raid|sata|virtual bus/firewire', ); foreach my $type (keys %t) { diff --git a/perl-install/NEWS b/perl-install/NEWS index 242bbc0d0..446a223b6 100644 --- a/perl-install/NEWS +++ b/perl-install/NEWS @@ -1,3 +1,4 @@ +- remove probing of disk/ide modules (obsolete since kernel 5.14) - sync list of modules needing firmware with kernel-desktop-6.18.9-1.mga9 - sync list_modules with kernel 6.18 diff --git a/perl-install/harddrake/data.pm b/perl-install/harddrake/data.pm index 8d4d4de21..2e450003c 100644 --- a/perl-install/harddrake/data.pm +++ b/perl-install/harddrake/data.pm @@ -82,8 +82,7 @@ our @tree = string => N("(E)IDE/ATA controllers"), icon => "ide_hd.png", configurator => "", - detector => sub { f(detect_devices::probe_category('disk/ide')), - f(grep { $_->{driver} =~ /^pata/ && $_->{media_type} =~ /IDE|STORAGE_SATA/ } @devices), + detector => sub { f(grep { $_->{driver} =~ /^pata/ && $_->{media_type} =~ /IDE|STORAGE_SATA/ } @devices), f(grep { $_->{media_type} =~ /STORAGE_(IDE|OTHER)/ } @devices) }, checked_on_boot => 1, }, diff --git a/perl-install/install/NEWS b/perl-install/install/NEWS index ec26dda28..a27344e9e 100644 --- a/perl-install/install/NEWS +++ b/perl-install/install/NEWS @@ -1,3 +1,4 @@ +- remove probing of disk/ide modules (obsolete since kernel 5.14) - sync list of modules needing firmware with kernel-desktop-6.18.9-1.mga9 - sync list_modules with kernel 6.18 - compensate for adjusted system clock when configureTimezone() is diff --git a/perl-install/install/steps.pm b/perl-install/install/steps.pm index f62566f4c..9b4d5f07a 100644 --- a/perl-install/install/steps.pm +++ b/perl-install/install/steps.pm @@ -254,10 +254,7 @@ sub setupSCSI { install::any::configure_pcmcia($o); modules::load(modules::category2modules('disk/cdrom')); modules::load_category($o->{modules_conf}, 'bus/firewire'); - modules::load_category($o->{modules_conf}, 'disk/scsi'); - #- load disk/scsi before disk/ide since libata is now the default - #- (to prevent modules::load_category from loading ide-generic too early) - modules::load_category($o->{modules_conf}, 'disk/ide|hardware_raid|sata|firewire'); + modules::load_category($o->{modules_conf}, 'disk/scsi|hardware_raid|sata|firewire'); install::any::getHds($o); } diff --git a/perl-install/install/steps_interactive.pm b/perl-install/install/steps_interactive.pm index 3a2586cae..66c75dac8 100644 --- a/perl-install/install/steps_interactive.pm +++ b/perl-install/install/steps_interactive.pm @@ -277,8 +277,8 @@ sub setupSCSI { modules::interactive::load_category($o, $o->{modules_conf}, 'bus/firewire', 1); my $have_non_scsi = detect_devices::hds(); #- at_least_one scsi device if we have no disks - modules::interactive::load_category($o, $o->{modules_conf}, 'disk/card_reader|ide|scsi|hardware_raid|sata|firewire|virtual', 1, !$have_non_scsi); - modules::interactive::load_category($o, $o->{modules_conf}, 'disk/card_reader|ide|scsi|hardware_raid|sata|firewire|virtual') if !detect_devices::hds(); #- we really want a disk! + modules::interactive::load_category($o, $o->{modules_conf}, 'disk/card_reader|scsi|hardware_raid|sata|firewire|virtual', 1, !$have_non_scsi); + modules::interactive::load_category($o, $o->{modules_conf}, 'disk/card_reader|scsi|hardware_raid|sata|firewire|virtual') if !detect_devices::hds(); #- we really want a disk! install::interactive::tellAboutProprietaryModules($o); diff --git a/perl-install/modules.pm b/perl-install/modules.pm index abeb0b366..6e345771b 100644 --- a/perl-install/modules.pm +++ b/perl-install/modules.pm @@ -182,7 +182,6 @@ sub load_category { $_->{try} = 1 if member($_->{driver}, 'hptraid', 'ohci1394'); #- do not warn when this fails } - eval { load_and_configure($conf, 'ide_generic') } if $category eq 'disk/ide'; grep { !($_->{error} && $_->{try}) } @l; } @@ -271,10 +270,7 @@ sub when_load { sub when_load_category { my ($conf, $name, $category) = @_; - if ($category =~ m,disk/ide,) { - $conf->add_probeall('ide-controller', $name); - eval { load('ide_gd_mod') }; - } elsif ($category =~ m,disk/(scsi|hardware_raid|sata|firewire|virtual),) { + if ($category =~ m,disk/(scsi|hardware_raid|sata|firewire|virtual),) { $conf->add_probeall('scsi_hostadapter', $name); eval { load('sd_mod') }; } elsif ($category eq 'bus/usb') { diff --git a/perl-install/modules/interactive.pm b/perl-install/modules/interactive.pm index dae135889..6d1cb5101 100644 --- a/perl-install/modules/interactive.pm +++ b/perl-install/modules/interactive.pm @@ -67,7 +67,7 @@ sub load_category__prompt_for_more { my $r = 'No'; $in->ask_from_({ messages => $msg, - if_($category =~ m!disk/.*(ide|sata|scsi|hardware_raid|usb|firewire)!, interactive_help_id => 'setupSCSI'), + if_($category =~ m!disk/.*(sata|scsi|hardware_raid|usb|firewire)!, interactive_help_id => 'setupSCSI'), }, [ { list => [ N_("Yes"), N_("No"), N_("See hardware info") ], val => \$r, type => 'list', format => \&translate } ]); if ($r eq "No") { return @l } @@ -82,7 +82,7 @@ sub load_category__prompt_for_more { my %category2text = ( 'bus/usb' => N_("Installing driver for USB controller"), 'bus/firewire' => N_("Installing driver for firewire controller \"%s\""), - 'disk/card_reader|ide|scsi|hardware_raid|sata|firewire|virtual' => N_("Installing driver for hard disk drive controller \"%s\""), + 'disk/card_reader|scsi|hardware_raid|sata|firewire|virtual' => N_("Installing driver for hard disk drive controller \"%s\""), list_modules::ethernet_categories() => N_("Installing driver for ethernet controller \"%s\""), ); diff --git a/perl-install/standalone/bootloader-config b/perl-install/standalone/bootloader-config index 187ca3eed..4df7bc146 100755 --- a/perl-install/standalone/bootloader-config +++ b/perl-install/standalone/bootloader-config @@ -143,8 +143,6 @@ sub remove_kernel_generic() { #-############################################################################### sub add_kernel() { - configure_ide_controller(); - my $kernel_str = bootloader::vmlinuz2kernel_str($image) or die "bad kernel name $image\n"; if (!$bootloader) { @@ -175,17 +173,6 @@ sub add_kernel() { modify_bootloader(); } -sub configure_ide_controller() { - my $modules_conf = modules::any_conf->read; - if ($modules_conf->get_alias('ide-controller') || - $modules_conf->get_probeall('ide-controller')) { - #- already configured - } elsif (my @l = detect_devices::probe_category('disk/ide')) { - $modules_conf->add_probeall('ide-controller', $_->{driver}) foreach @l; - $modules_conf->write; - } -} - sub modify_bootloader() { !$no_entry or return; |