merged with SLES15-GA

yast · Nov 2, 2018 · 0cd508a · 0cd508a
2 parents 37ece90 + b02e1f9
commit 0cd508a
Show file tree

Hide file tree

Showing 4 changed files with 28 additions and 1 deletion.
diff --git a/package/yast2-installation.changes b/package/yast2-installation.changes
@@ -1,3 +1,11 @@
+-------------------------------------------------------------------
+Fri Nov  2 13:23:30 UTC 2018 - schubi@suse.de
+
+- Writing security settings in first AY installation stage.
+  So other modules (e.g. users) can rely on these settings now.
+  (bnc#1112769)
+- 4.1.25
+
 -------------------------------------------------------------------
 Thu Nov  1 08:03:27 UTC 2018 - jreidinger@suse.com
 
@@ -49,6 +57,7 @@ Tue Sep 25 10:35:03 CEST 2018 - schubi@suse.de
 - Updated docu for add_on_products.xml: Added tag "confirm_license"
   to handle Add-On-products licenses which will be added while
   installation. (bsc#1105758)
+<<<<<<< HEAD
 - 4.1.17  
 
 -------------------------------------------------------------------
@@ -106,12 +115,19 @@ Mon Aug 20 15:18:28 CEST 2018 - schubi@suse.de
 
 - Switched license in spec file from SPDX2 to SPDX3 format.
 - Changed dir of COPYING file.
+=======
+- 4.0.71
+>>>>>>> SLE-15-GA
 
 -------------------------------------------------------------------
 Thu Aug  2 09:05:07 UTC 2018 - schubi@suse.de
 
 - Disable display of status messages on the console (bsc#1099505).
+<<<<<<< HEAD
 - 4.1.8
+=======
+- 4.0.70
+>>>>>>> SLE-15-GA
 
 -------------------------------------------------------------------
 Thu Aug  2 08:05:07 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.1.24
+Version:        4.1.25
 Release:        0
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build

diff --git a/src/lib/installation/clients/inst_finish.rb b/src/lib/installation/clients/inst_finish.rb
@@ -346,6 +346,7 @@ def copy_files_steps
         "ldconfig",
         "save_config",
         "live_save_config",
+        "security",
         "default_target",
         "desktop",
         "storage",

diff --git a/startup/YaST2.call b/startup/YaST2.call
@@ -709,6 +709,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
 
 if [ $SELECTED_MEDIUM != "SSH" ] && [ "$Y2_MODE" = "ncurses" ]; then