Merge 325da4c into 729a3f3

package/yast2-installation.changes

@@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Thu Mar 14 14:49:56 UTC 2019 - snwint@suse.com
+
+- ensure that installation with VNC + textmode still installs
+  via VNC (bsc#1129073)
+- 3.3.0.2
+
 -------------------------------------------------------------------
 Tue Mar  5 12:50:33 UTC 2019 - mvidner@suse.com
 

package/yast2-installation.spec

@@ -17,7 +17,7 @@
 
 
 Name:           yast2-installation
-Version:        3.3.0.1
+Version:        3.3.0.2
 Release:        0
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build

startup/YaST2.call

@@ -247,17 +247,6 @@ function check_network () {
 		log "\tNo network interface found, fatal error"
 		fatalError
 	fi
-	if [ "$Textmode" = 1 ];then
-		log "\tTextmode selected for network install"
-		Y2_MODE=ncurses
-	elif [ ! -z "$DISPLAY" ];then
-		log "\tDisplay: $DISPLAY found for network install"
-		Y2_MODE=qt
-		if ! check_qt ; then
-			log "\tQt plugin check failed falling back to ncurses"
-			Y2_MODE=ncurses
-		fi
-	fi
 }
 
 #----[ check_vnc ]----#
@@ -281,6 +270,24 @@ function check_vnc () {
 	fi
 }
 
+#----[ set_y2mode_ssh ]----#
+function set_y2mode_ssh () {
+#------------------------------------------------------
+# Set Y2_MODE to 'qt' if $DISPLAY is set and text mode has not been requested.
+# ---
+	if [ "$Textmode" = 1 -o -z "$DISPLAY" ] ; then
+		log "\tTextmode selected for SSH install"
+		Y2_MODE=ncurses
+	else
+		log "\tDisplay: $DISPLAY found for SSH install"
+		Y2_MODE=qt
+	fi
+
+	if ! check_qt ; then
+		log "\tQt plugin check failed falling back to ncurses"
+		Y2_MODE=ncurses
+	fi
+}
 
 function ssh_reboot_message()
 {
@@ -640,23 +647,22 @@ log "\tSelected medium is: $SELECTED_MEDIUM"
 #---------------------------------------------
 case $SELECTED_MEDIUM in
 	QT)      prepare_for_qt      ; Y2_MODE=qt      ;;
-	SSH)     prepare_for_ssh     ; Y2_MODE=ncurses ;;
+	SSH)     prepare_for_ssh     ; set_y2mode_ssh  ;;
 	VNC)     prepare_for_vnc     ; Y2_MODE=qt      ;;
 	NCURSES) prepare_for_ncurses ; Y2_MODE=ncurses ;;
 esac
 
 #=============================================
 # 7) Check prepared medium
 #---------------------------------------------
+# check_x11 may change Y2_MODE to ncurses if X11 isn't working
+# ---
 case $SELECTED_MEDIUM in
 	QT)  check_x11     ;;
 	SSH) check_network ;;
 	VNC) check_vnc     ;;
 esac
 
-# The prepare_for_ncurses in step 6 is kinda useless if step 7 can
-# change Y2MODE to ncurses in several ways
-
 #running with threads (#164999, FaTE #301899)
 #if [ "$Y2_MODE" = "ncurses" ]; then
 #    Y2_UI_ARGS=--nothreads