Merge pull request #778 from yast/textmode-ssh

Respect Textmode=1 when installing over SSH with a DISPLAY (bsc#1047470)
yast · Mar 5, 2019 · f376a72 · f376a72
2 parents 9f2ea75 + dec051e
commit f376a72
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 6 deletions.
diff --git a/package/yast2-installation.changes b/package/yast2-installation.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Tue Mar  5 10:31:35 UTC 2019 - mvidner@suse.com
+
+- Respect Textmode=1 when installing over SSH with a DISPLAY (bsc#1047470)
+- 4.1.38
+
 -------------------------------------------------------------------
 Fri Mar  1 12:12:31 UTC 2019 - mvidner@suse.com
 

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

diff --git a/startup/YaST2.call b/startup/YaST2.call
@@ -232,13 +232,16 @@ function check_network () {
 		log "\tNo network interface found, fatal error"
 		fatalError
 	fi
-	if [ ! -z "$DISPLAY" ];then
+	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
-	fi
-	if ! check_qt ; then
-	    log "\tQt plugin check failed falling back to ncurses"
-	    Y2_MODE=ncurses
+		if ! check_qt ; then
+			log "\tQt plugin check failed falling back to ncurses"
+			Y2_MODE=ncurses
+		fi
 	fi
 }