Attachment 10707 Details for Bug 24278 – do not call 'setupSCSI' for local install

[patch] do not call 'setupSCSI' for local install

0001-do-not-call-setupSCSI-for-local-install.patch (text/plain), 1.06 KB, created by Thierry Vignaud on 2019-02-01 14:30:31 CET

(hide)

Description:

Filename:

MIME Type:

Creator: Thierry Vignaud

Created: 2019-02-01 14:30:31 CET

Size: 1.06 KB

patch

obsolete

>From 6a13144900942869e12680c5f321628f02a021d8 Mon Sep 17 00:00:00 2001
>From: Thierry Vignaud <thierry.vignaud@gmail.com>
>Date: Fri, 1 Feb 2019 14:10:46 +0100
>Subject: [PATCH] do not call 'setupSCSI' for local install
>
>---
> perl-install/install/steps.pm | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
>diff --git a/perl-install/install/steps.pm b/perl-install/install/steps.pm
>index 91e90e042..1df80566f 100644
>--- a/perl-install/install/steps.pm
>+++ b/perl-install/install/steps.pm
>@@ -153,7 +153,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');
>+    modules::load_category($o->{modules_conf}, 'disk/scsi') if !$::local_install;
>     #- 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');
>-- 
>2.20.1
>

From 6a13144900942869e12680c5f321628f02a021d8 Mon Sep 17 00:00:00 2001
From: Thierry Vignaud <thierry.vignaud@gmail.com>
Date: Fri, 1 Feb 2019 14:10:46 +0100
Subject: [PATCH] do not call 'setupSCSI' for local install

---
 perl-install/install/steps.pm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/perl-install/install/steps.pm b/perl-install/install/steps.pm
index 91e90e042..1df80566f 100644
--- a/perl-install/install/steps.pm
+++ b/perl-install/install/steps.pm
@@ -153,7 +153,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');
+    modules::load_category($o->{modules_conf}, 'disk/scsi') if !$::local_install;
     #- 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');
-- 
2.20.1

Actions: View | Diff

Attachments on bug 24278: 10707 | 10708 | 10709 | 10713