Merge pull request #898 from yast/correct-program-paths

Don't use nonexisting programs
yast · Feb 27, 2019 · 695b3a5 · 695b3a5
2 parents 55f2f4e + 23ef051
commit 695b3a5
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 3 deletions.
diff --git a/library/general/src/scrconf/run_ifconfig.scr b/library/general/src/scrconf/run_ifconfig.scr
@@ -46,7 +46,7 @@
 
 `ag_anyagent(
   `Description (
-	(`Run("/sbin/ifconfig | /bin/sed -e '/.*inet6.*/d'")),
+	(`Run("/usr/bin/ifconfig | /bin/sed -e '/.*inet6.*/d'")),
 	"\n",
 	true,
 	(`List(

diff --git a/library/network/src/modules/NetworkPopup.rb b/library/network/src/modules/NetworkPopup.rb
@@ -195,7 +195,7 @@ def NFSServer(selected)
         UI.OpenDialog(Label(_("Scanning for hosts on this LAN...")))
         # #71064
         # this works also if ICMP broadcasts are ignored
-        cmd = "/usr/sbin/rpcinfo -b mountd 1 | /usr/bin/cut -d ' ' -f 2 | /usr/bin/sort -u"
+        cmd = "/sbin/rpcinfo -b mountd 1 | /usr/bin/cut -f 2 | /usr/bin/sort -u"
         out = Convert.to_map(SCR.Execute(path(".target.bash_output"), cmd))
         @found_nfs_servers = Builtins.filter(
           Builtins.splitstring(Ops.get_string(out, "stdout", ""), "\n")

diff --git a/package/yast2.changes b/package/yast2.changes
@@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Wed Feb 27 12:10:49 UTC 2019 - mvidner@suse.com
+
+- Use /sbin/rpcinfo only, /usr/sbin/rpcinfo is gone (bsc#1127138).
+- Use the correct path for /usr/bin/ifconfig (bsc#1127138).
+- 4.1.56
+
 -------------------------------------------------------------------
 Mon Feb 18 07:47:37 UTC 2019 - lslezak@suse.cz
 

diff --git a/package/yast2.spec b/package/yast2.spec
@@ -17,7 +17,7 @@
 
 
 Name:           yast2
-Version:        4.1.55
+Version:        4.1.56
 Release:        0
 Summary:        YaST2 - Main Package
 License:        GPL-2.0-only