Merge branch 'SLE-12-SP1'

Conflicts: package/yast2-installation.changes package/yast2-installation.spec
yast · Apr 15, 2016 · 6b698d4 · 6b698d4
2 parents e6e97b1 + fa35639
commit 6b698d4
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 3 deletions.
diff --git a/package/yast2-installation.changes b/package/yast2-installation.changes
@@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Wed Apr 13 07:14:09 UTC 2016 - mfilka@suse.com
+
+- bsc#956473
+  - improved formatting of network interfaces listing
+- 3.1.179
+
 -------------------------------------------------------------------
 Tue Apr 12 15:09:15 UTC 2016 - jreidinger@suse.com
 

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

diff --git a/startup/common/network.sh b/startup/common/network.sh
@@ -47,7 +47,15 @@ function list_ifaces()
     # list network interfaces
     # - all active ones with all IPv4 / IPv6 addresses
     # - excluding loopback device
-    /sbin/ip -o a s | grep "inet" | cut -d' ' -f2 | uniq | grep -v "^lo" | xargs -n1 -d'\n' /sbin/ip a s
+    ifaces=$(/sbin/ip -oneline address show | grep "inet" | cut --delimiter=' ' --fields=2 | uniq | grep --invert-match "^lo")
+
+    for i in ${ifaces}; do
+      ip address show $i | sed --quiet \
+        --expression="1{s/^[^ ]* \([^:]*\).*/\1:/;h}" \
+        --expression="/ether/{ s/^.*ether[^ ]* \([^ ]*\).*/\1/; H; g; s/\n/ /; p}" \
+        --expression="s/^[ ]*inet \([^ ]*\).*/  \1/p" \
+        --expression="s/^[ ]*inet6 \([^ ]*\).*/  \1/p"
+    done;
 }
 
 
@@ -77,7 +85,7 @@ function ssh_message () {
 	you can login now and proceed with the installation
 	run the command 'yast.ssh'
 	
-	active interfaces:
+	These network addresses are available:
 	
 	EOF
 	list_ifaces