Attachment 10713 Details for Bug 24278 – Extended alternative patch v2

[patch] Extended alternative patch v2

skip-setupSCSI-for-local-install.patch (text/plain), 1.25 KB, created by Martin Whitaker on 2019-02-01 18:02:44 CET

(hide)

Description:

Filename:

MIME Type:

Creator: Martin Whitaker

Created: 2019-02-01 18:02:44 CET

Size: 1.25 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..5be52deb9 100644
>--- a/perl-install/install/steps.pm
>+++ b/perl-install/install/steps.pm
>@@ -194,11 +194,11 @@ sub doPartitionDisksAfter {
>     log::l("fdisk after\n" . any::fdisk());
> 
>     if ($::local_install) {
>-	my $p = fs::get::mntpoint2part($::prefix, [ fs::read_fstab('', '/proc/mounts') ]);
>-	my $part = find { fs::get::is_same_hd($p, $_) } @{$o->{fstab}};
>-	$part ||= $o->{fstab}[0];
>+	my $fstab = [ fs::read_fstab('', '/proc/mounts') ];
>+	my $part = fs::get::mntpoint2part($::prefix, $fstab) || $fstab[0];
> 	$part->{mntpoint} = '/';
> 	$part->{isMounted} = 1;
>+	$o->{fstab} = [ $part ];
>     }
> 
>     fs::any::check_hds_boot_and_root($o->{all_hds}, $o->{fstab}, $o->{isUpgrade}, $o->{match_all_hardware});

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..5be52deb9 100644
--- a/perl-install/install/steps.pm
+++ b/perl-install/install/steps.pm
@@ -194,11 +194,11 @@ sub doPartitionDisksAfter {
     log::l("fdisk after\n" . any::fdisk());
 
     if ($::local_install) {
-	my $p = fs::get::mntpoint2part($::prefix, [ fs::read_fstab('', '/proc/mounts') ]);
-	my $part = find { fs::get::is_same_hd($p, $_) } @{$o->{fstab}};
-	$part ||= $o->{fstab}[0];
+	my $fstab = [ fs::read_fstab('', '/proc/mounts') ];
+	my $part = fs::get::mntpoint2part($::prefix, $fstab) || $fstab[0];
 	$part->{mntpoint} = '/';
 	$part->{isMounted} = 1;
+	$o->{fstab} = [ $part ];
     }
 
     fs::any::check_hds_boot_and_root($o->{all_hds}, $o->{fstab}, $o->{isUpgrade}, $o->{match_all_hardware});

Actions: View | Diff

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