Merge pull request #28 from kobliha/SLE-12-GA

Removed obsolete service (nfsboot) handling
yast · Nov 7, 2014 · 3e43bdc · 3e43bdc
2 parents 5e67076 + f879ab3
commit 3e43bdc
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 5 deletions.
diff --git a/package/yast2-nfs-client.changes b/package/yast2-nfs-client.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Fri Nov  7 17:00:31 CET 2014 - locilka@suse.com
+
+- Removed obsolete service (nfsboot) handling (bnc#867766)
+- 3.1.9.1
+
 -------------------------------------------------------------------
 Thu Sep  4 12:23:22 UTC 2014 - mvidner@suse.com
 

diff --git a/package/yast2-nfs-client.spec b/package/yast2-nfs-client.spec
@@ -17,7 +17,7 @@
 
 
 Name:           yast2-nfs-client
-Version:        3.1.9
+Version:        3.1.9.1
 Release:        0
 Url:            https://github.com/yast/yast-nfs-client
 

diff --git a/src/modules/Nfs.rb b/src/modules/Nfs.rb
@@ -459,9 +459,6 @@ def WriteOnly
       if Builtins.size(@nfs_entries) != 0
         Service.Enable(@portmapper)
         Service.Enable("nfs")
-        # #36737: it just runs sm_notify at boot time
-        # replaces rpc.statd
-        Service.Enable("nfsboot")
       end
 
       if @nfs4_enabled == true

diff --git a/testsuite/tests/readwrite.rb b/testsuite/tests/readwrite.rb
@@ -39,7 +39,6 @@ def main
             "runlevel" => {
               "portmap"        => @service_on,
               "nfs"            => @service_on,
-              "nfsboot"        => @service_off,
               "network"        => @service_off,
               "networkmanager" => @service_on
             },