Merge pull request #894 from joseivanlopez/merge_GA

Merge SLE-15-GA
yast · Apr 4, 2019 · aad1181 · aad1181
2 parents 042eef9 + 06875a7
commit aad1181
Show file tree

Hide file tree

Showing 3 changed files with 23 additions and 2 deletions.
diff --git a/package/yast2-storage-ng.changes b/package/yast2-storage-ng.changes
@@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Wed Apr  3 08:09:10 UTC 2019 - José Iván López González <jlopez@suse.com>
+
+- Fix NFS root detection when installing with AutoYaST
+  (needed for bsc#1130256).
+- 4.1.80
+
 -------------------------------------------------------------------
 Wed Apr  3 07:12:34 UTC 2019 - David Diaz <dgonzalez@suse.com>
 
@@ -1005,7 +1012,7 @@ Wed Apr 18 10:37:17 UTC 2018 - ancor@suse.com
 -------------------------------------------------------------------
 Tue Apr 17 12:01:08 UTC 2018 - shundhammer@suse.com
 
-- Added missing help texts in the partitioner (bsc#1079591) 
+- Added missing help texts in the partitioner (bsc#1079591)
 - 4.0.157
 
 -------------------------------------------------------------------

diff --git a/package/yast2-storage-ng.spec b/package/yast2-storage-ng.spec
@@ -16,7 +16,7 @@
 #
 
 Name:		yast2-storage-ng
-Version:	4.1.79
+Version:	4.1.80
 Release:	0
 
 BuildRoot:	%{_tmppath}/%{name}-%{version}-build

diff --git a/src/lib/y2storage/boot_requirements_checker.rb b/src/lib/y2storage/boot_requirements_checker.rb
@@ -154,6 +154,20 @@ def arch_strategy_class
     #
     # @return [Boolean]
     def nfs_root?
+      planned_nfs_root? || exist_nfs_root?
+    end
+
+    # Whether there is a planned NFS root
+    #
+    # @return [Boolean]
+    def planned_nfs_root?
+      planned_devices.find { |d| d.is_a?(Planned::Nfs) && d.mount_point == "/" }
+    end
+
+    # Whether a NFS root already exists
+    #
+    # @return [Boolean]
+    def exist_nfs_root?
       devicegraph.nfs_mounts.any? { |i| i.mount_point && i.mount_point.root? }
     end