Merge pull request #21 from ancorgs/ypdomainname

Use the correct location for ypdomainname (bnc#916031)
yast · Feb 4, 2015 · c7e7e03 · c7e7e03
2 parents 2140267 + 5ef5ff8
commit c7e7e03
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 7 deletions.
diff --git a/package/yast2-nis-client.changes b/package/yast2-nis-client.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Wed Feb  4 11:01:53 UTC 2015 - ancor@suse.com
+
+- Use correct location for ypdomainname (bnc#916031)
+- 3.1.12
+
 -------------------------------------------------------------------
 Thu Dec  4 09:50:31 UTC 2014 - jreidinger@suse.com
 

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

diff --git a/src/modules/Nis.rb b/src/modules/Nis.rb
@@ -908,10 +908,8 @@ def Read
       @multidomain_broadcast = {} if @multidomain_broadcast == nil
       @slp_domain = {} if @slp_domain == nil
 
-      out = Convert.to_map(
-        SCR.Execute(path(".target.bash_output"), "/bin/ypdomainname")
-      )
-      @domain = Builtins.deletechars(Ops.get_string(out, "stdout", ""), "\n")
+      out = SCR.Execute(path(".target.bash_output"), "/usr/bin/ypdomainname")
+      @domain = out["stdout"].chomp
       @old_domain = @domain
 
       @dhcpcd_running = SCR.Execute(

diff --git a/testsuite/tests/readwrite.out b/testsuite/tests/readwrite.out
@@ -1,7 +1,7 @@
 Dump	no policy
 Read	.sysconfig.network.config.NETCONFIG_NIS_POLICY ""
 Dir	.sysconfig.network.config: ["NETCONFIG_NIS_POLICY"]
-Execute	.target.bash_output "/bin/ypdomainname" $["exit":0, "stderr":"", "stdout":"mydomain\n"]
+Execute	.target.bash_output "/usr/bin/ypdomainname" $["exit":0, "stderr":"", "stdout":"mydomain\n"]
 Execute	.target.bash "ls /var/run/dhcpcd-*.pid" 0
 Read	.sysconfig.ypbind.YPBIND_LOCAL_ONLY "no"
 Read	.sysconfig.ypbind.YPBIND_BROADCAST "no"
@@ -27,7 +27,7 @@ Return	true
 Dump	auto policy
 Read	.sysconfig.network.config.NETCONFIG_NIS_POLICY "auto"
 Dir	.sysconfig.network.config: ["NETCONFIG_NIS_POLICY"]
-Execute	.target.bash_output "/bin/ypdomainname" $["exit":0, "stderr":"", "stdout":"mydomain\n"]
+Execute	.target.bash_output "/usr/bin/ypdomainname" $["exit":0, "stderr":"", "stdout":"mydomain\n"]
 Execute	.target.bash "ls /var/run/dhcpcd-*.pid" 0
 Read	.sysconfig.ypbind.YPBIND_LOCAL_ONLY "no"
 Read	.sysconfig.ypbind.YPBIND_BROADCAST "no"