Sle 15 ga sle12 sp4 (#731)

* cherry pick from SLES12-SP4
yast · Aug 2, 2018 · 03d90d5 · 03d90d5
1 parent 61fff46
commit 03d90d5
Show file tree

Hide file tree

Showing 4 changed files with 33 additions and 2 deletions.
diff --git a/package/YaST2-Firstboot.service b/package/YaST2-Firstboot.service
@@ -10,7 +10,7 @@ OnFailure=shutdown.target
 [Service]
 Type=oneshot
 Environment=TERM=linux
-ExecStartPre=-/usr/bin/plymouth quit
+ExecStartPre=/bin/sh -c "/usr/bin/plymouth quit 2>/dev/null || :"
 ExecStart=/usr/lib/YaST2/startup/YaST2.Firstboot
 ExecStartPost=/usr/bin/rm -f /var/lib/YaST2/reconfig_system
 ExecStartPost=/usr/bin/systemctl restart systemd-vconsole-setup.service

diff --git a/package/yast2-installation.changes b/package/yast2-installation.changes
@@ -1,3 +1,14 @@
+-------------------------------------------------------------------
+Thu Aug  2 09:05:07 UTC 2018 - schubi@suse.de
+
+- Disable display of status messages on the console (bsc#1099505).
+- 4.0.70
+
+-------------------------------------------------------------------
+Thu Aug  2 08:05:07 UTC 2018 - knut.anderssen@suse.com
+
+- Don not print errors if plymouth is not installed (bsc#1101879)
+
 -------------------------------------------------------------------
 Thu Jul 26 15:45:03 UTC 2018 - knut.anderssen@suse.com
 

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

diff --git a/startup/YaST2.call b/startup/YaST2.call
@@ -129,6 +129,16 @@ function prepare_for_ncurses () {
 	check_run_fbiterm
 	log "\tCheck for FB-I-terminal: RUN_FBITERM = $RUN_FBITERM"
 	set_inst_ncurses_env
+	#=============================================================
+	# Disable display of status messages on the console, as
+	# controlled via systemd.show_status=0 on the kernel command.
+	# line. (see "man systemd")
+	# In the case of SSH installation messages will be displayed
+	# on console only. So we do not need it here.
+	#-------------------------------------------------------------
+	if [ $SELECTED_MEDIUM != "SSH" ]; then
+	    /usr/bin/kill -SIGRTMIN+21 1
+	fi
 }
 
 #----[ prepare_for_ssh ]----#
@@ -669,6 +679,16 @@ if [ $SELECTED_MEDIUM = "SSH" ] && [ ! "$VNC" = 1 ];then
 	# when found the ssh daemon is killed, so create this file as the very last step!!
 	# (https://github.com/openSUSE/installation-images/blob/c57181329ab7040369da705c5b0ddd78e2960bf0/data/root/etc/inst_setup#L221-L229)
 	echo $Y2_EXIT_CODE > /tmp/YaST2_ssh_installation_finished
+fi	
+
+if [ $SELECTED_MEDIUM != "SSH" ] && [ "$Y2_MODE" = "ncurses" ]; then
+    # Enable display of status messages on the
+    # console, as controlled via systemd.show_status=1
+    # on the kernel command line (see "man systemd")
+    # In the case of SSH installation messages will be displayed
+    # on console only. So we do not need it here because we
+    # have not disabled it while YAST installation.
+    /usr/bin/kill -SIGRTMIN+20 1
 fi
 
 #=============================================