Revert "Merge pull request #166 from yast/netdev_fix_SLE-12-GA"

This reverts commit 2499e86, reversing changes made to 8f64243.
yast · Nov 26, 2015 · cb46639 · cb46639
1 parent 2499e86
commit cb46639
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 23 deletions.
diff --git a/package/yast2-storage.changes b/package/yast2-storage.changes
@@ -1,10 +1,3 @@
--------------------------------------------------------------------
-Wed Nov 11 14:21:32 CET 2015 - gs@suse.de
-
-- Add _netdev flag for iSCSI and FCoE backed fstab entries
-  (bsc#949683, patch provided by david.bond@microfocus.com)
-- version 3.1.45.1
-
 -------------------------------------------------------------------
 Tue Sep 22 15:50:00 UTC 2015 - igonzalezsosa@suse.com
 

diff --git a/package/yast2-storage.spec b/package/yast2-storage.spec
@@ -17,7 +17,7 @@
 
 
 Name:           yast2-storage
-Version:        3.1.45.1
+Version:        3.1.45
 Release:        0
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build

diff --git a/src/modules/FileSystems.rb b/src/modules/FileSystems.rb
@@ -1758,7 +1758,6 @@ def DefaultFstabOptions(part)
 
       if Ops.get_string(part, "mount", "") != "/"
         need_nofail = false
-        need_netdev = false
         assertInit
 
         devs = Convert.convert(
@@ -1775,21 +1774,16 @@ def DefaultFstabOptions(part)
           # USB since those might actually not be present during boot
           # iSCSI since the boot scripts need it
           hotplug_transports = [::Storage::USB, ::Storage::ISCSI]
-          network_transports = [::Storage::ISCSI, ::Storage::FCOE]
 
           usedby_devices.each do |usedby_device|
             dp = ::Storage::ContVolInfo.new()
             if @sint.getContVolInfo(usedby_device, dp)==0 &&
                 dp.ctype == ::Storage::DISK
               disk = dp.cdevice
               infos = ::Storage::DiskInfo.new()
-              if @sint.getDiskInfo(disk, infos)==0
-                if Builtins.contains(hotplug_transports, infos.transport)
-                  need_nofail = true
-               end
-                if Builtins.contains(network_transports, infos.transport)
-                   need_netdev = true
-               end
+              if @sint.getDiskInfo(disk, infos)==0 &&
+                  Builtins.contains(hotplug_transports, infos.transport)
+                need_nofail = true
               end
             end
           end
@@ -1800,12 +1794,6 @@ def DefaultFstabOptions(part)
             end
             fst_default = Ops.add(fst_default, "nofail")
           end
-          if need_netdev
-            if !Builtins.isempty(fst_default)
-              fst_default = Ops.add(fst_default, ",")
-            end
-            fst_default = Ops.add(fst_default, "_netdev")
-          end
         end
       end