Attachment 10709 Details for Bug 24278 – Extended alternative patch

Extended alternative patch

skip-setupSCSI-for-local-install.patch (text/plain), 1.12 KB, created by Martin Whitaker on 2019-02-01 14:54:32 CET

(hide)

Description:

Filename:

MIME Type:

Creator: Martin Whitaker

Created: 2019-02-01 14:54:32 CET

Size: 1.12 KB

patch

obsolete

>diff --git a/perl-install/install/install2.pm b/perl-install/install/install2.pm
>index d214d8448..bd037cf04 100644
>--- a/perl-install/install/install2.pm
>+++ b/perl-install/install/install2.pm
>@@ -159,7 +159,7 @@ sub selectMouse {
> sub setupSCSI {
>     my ($auto) = @_;
> 
>-    installStepsCall($o, $auto, 'setupSCSI');
>+    installStepsCall($o, $auto, 'setupSCSI') if !$::local_install;
> }
> 
> #------------------------------------------------------------------------------
>diff --git a/perl-install/install/steps.pm b/perl-install/install/steps.pm
>index 91e90e042..0fc02538f 100644
>--- a/perl-install/install/steps.pm
>+++ b/perl-install/install/steps.pm
>@@ -194,7 +194,9 @@ sub doPartitionDisksAfter {
>     log::l("fdisk after\n" . any::fdisk());
> 
>     if ($::local_install) {
>-	my $p = fs::get::mntpoint2part($::prefix, [ fs::read_fstab('', '/proc/mounts') ]);
>+	$o->{fstab} = [ fs::read_fstab('', '/proc/mounts') ];
>+	$_->{isMounted} = 1 foreach @{$o->{fstab}};
>+	my $p = fs::get::mntpoint2part($::prefix, $o->{fstab});
> 	my $part = find { fs::get::is_same_hd($p, $_) } @{$o->{fstab}};
> 	$part ||= $o->{fstab}[0];
> 	$part->{mntpoint} = '/';

diff --git a/perl-install/install/install2.pm b/perl-install/install/install2.pm
index d214d8448..bd037cf04 100644
--- a/perl-install/install/install2.pm
+++ b/perl-install/install/install2.pm
@@ -159,7 +159,7 @@ sub selectMouse {
 sub setupSCSI {
     my ($auto) = @_;
 
-    installStepsCall($o, $auto, 'setupSCSI');
+    installStepsCall($o, $auto, 'setupSCSI') if !$::local_install;
 }
 
 #------------------------------------------------------------------------------
diff --git a/perl-install/install/steps.pm b/perl-install/install/steps.pm
index 91e90e042..0fc02538f 100644
--- a/perl-install/install/steps.pm
+++ b/perl-install/install/steps.pm
@@ -194,7 +194,9 @@ sub doPartitionDisksAfter {
     log::l("fdisk after\n" . any::fdisk());
 
     if ($::local_install) {
-	my $p = fs::get::mntpoint2part($::prefix, [ fs::read_fstab('', '/proc/mounts') ]);
+	$o->{fstab} = [ fs::read_fstab('', '/proc/mounts') ];
+	$_->{isMounted} = 1 foreach @{$o->{fstab}};
+	my $p = fs::get::mntpoint2part($::prefix, $o->{fstab});
 	my $part = find { fs::get::is_same_hd($p, $_) } @{$o->{fstab}};
 	$part ||= $o->{fstab}[0];
 	$part->{mntpoint} = '/';

Actions: View

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