Merge pull request #268 from yast/display_ip

Support custom display number in "display_ip" boot option (bnc#913888)
yast · Feb 6, 2015 · 143b0db · 143b0db
2 parents 3a3f74b + a0d9f6c
commit 143b0db
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 Feb  4 13:15:43 UTC 2015 - lslezak@suse.cz
+
+- support custom display number in "display_ip" boot option
+  (bnc#913888)
+- 3.1.130
+
 -------------------------------------------------------------------
 Tue Feb  3 11:11:49 CET 2015 - schubi@suse.de
 

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

diff --git a/startup/YaST2.call b/startup/YaST2.call
@@ -488,8 +488,16 @@ fi
 # 3.1.7) Check for remote display usage
 if [ ! -z $Display_IP ];then
 	log "\tRemote Display usage -> Medium Qt enabled"
-	log "\tExporting DISPLAY to host: $Display_IP:0.0"
-	export DISPLAY="$Display_IP:0.0"
+        # check if a display is defined, check for ":<display>[.<screen>]" suffix
+        # Note: IPv6 address needs to be enclosed in square brackets because
+        # it uses ':' delimiter which can cause ambiguity
+        SCREEN_REGEX="(^([^:]+|\[.*\]):[0-9]+(|\.[0-9]+)$)"
+        if [[ $Display_IP =~ $SCREEN_REGEX ]]; then
+          export DISPLAY="$Display_IP"
+        else
+          export DISPLAY="$Display_IP:0.0"
+        fi
+        log "\tExporting DISPLAY: $DISPLAY"
 	NEED_XSERVER=""
 	MEDIUM[0]=1
 fi