Script 'mail_helper' called by obssrc
Hello community,

here is the log from the commit of package yast2-installation for 
openSUSE:Factory checked in at 2022-04-30 00:45:03
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/yast2-installation (Old)
 and      /work/SRC/openSUSE:Factory/.yast2-installation.new.1538 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Package is "yast2-installation"

Sat Apr 30 00:45:03 2022 rev:504 rq:973203 version:4.5.1

Changes:
--------
--- /work/SRC/openSUSE:Factory/yast2-installation/yast2-installation.changes    
2022-04-14 17:24:21.839186143 +0200
+++ 
/work/SRC/openSUSE:Factory/.yast2-installation.new.1538/yast2-installation.changes
  2022-04-30 00:45:43.666961284 +0200
@@ -1,0 +2,7 @@
+Mon Apr 25 23:10:17 UTC 2022 - Knut Anderssen <kanders...@suse.com>
+
+- Revert changes introduced in v4.3.50 as it produces some ordering
+  cycle issues (bsc#1198294)
+- 4.5.1
+
+-------------------------------------------------------------------

Old:
----
  yast2-installation-4.5.0.tar.bz2

New:
----
  yast2-installation-4.5.1.tar.bz2

++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Other differences:
------------------
++++++ yast2-installation.spec ++++++
--- /var/tmp/diff_new_pack.OQw05I/_old  2022-04-30 00:45:44.402961922 +0200
+++ /var/tmp/diff_new_pack.OQw05I/_new  2022-04-30 00:45:44.406961925 +0200
@@ -17,7 +17,7 @@
 
 
 Name:           yast2-installation
-Version:        4.5.0
+Version:        4.5.1
 Release:        0
 Summary:        YaST2 - Installation Parts
 License:        GPL-2.0-only

++++++ YaST2-Firstboot.service ++++++
--- /var/tmp/diff_new_pack.OQw05I/_old  2022-04-30 00:45:44.442961957 +0200
+++ /var/tmp/diff_new_pack.OQw05I/_new  2022-04-30 00:45:44.446961960 +0200
@@ -6,7 +6,7 @@
 Conflicts=plymouth-start.service
 Before=getty@tty1.service serial-getty@ttyS0.service 
serial-getty@ttyS1.service serial-getty@ttyS2.service
 Before=serial-getty@hvc0.service serial-getty@ttyAMA0.service
-Before=display-manager.service xvnc.socket
+Before=display-manager.service
 ConditionPathExists=/var/lib/YaST2/reconfig_system
 OnFailure=shutdown.target
 

++++++ YaST2-Second-Stage.service ++++++
--- /var/tmp/diff_new_pack.OQw05I/_old  2022-04-30 00:45:44.466961977 +0200
+++ /var/tmp/diff_new_pack.OQw05I/_new  2022-04-30 00:45:44.470961981 +0200
@@ -10,8 +10,8 @@
 Before=getty@tty1.service getty@tty2.service getty@tty3.service 
getty@tty4.service getty@tty5.service getty@tty6.service
 Before=serial-getty@ttyS0.service serial-getty@ttyS1.service 
serial-getty@ttyS2.service
 Before=serial-getty@hvc0.service serial-getty@ttyAMA0.service 
serial-getty@ttysclp0.service
-# Prevent too early user login (bsc#1196594) and too early vnc connection 
(bsc#1197265)
-Before=display-manager.service xvnc.socket
+# Prevent too early user login (bsc#1196594)
+Before=display-manager.service
 ConditionPathExists=/var/lib/YaST2/runme_at_boot
 
 [Service]

++++++ yast2-installation-4.5.0.tar.bz2 -> yast2-installation-4.5.1.tar.bz2 
++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' 
old/yast2-installation-4.5.0/package/YaST2-Firstboot.service 
new/yast2-installation-4.5.1/package/YaST2-Firstboot.service
--- old/yast2-installation-4.5.0/package/YaST2-Firstboot.service        
2022-04-12 13:34:42.000000000 +0200
+++ new/yast2-installation-4.5.1/package/YaST2-Firstboot.service        
2022-04-27 15:31:53.000000000 +0200
@@ -6,7 +6,7 @@
 Conflicts=plymouth-start.service
 Before=getty@tty1.service serial-getty@ttyS0.service 
serial-getty@ttyS1.service serial-getty@ttyS2.service
 Before=serial-getty@hvc0.service serial-getty@ttyAMA0.service
-Before=display-manager.service xvnc.socket
+Before=display-manager.service
 ConditionPathExists=/var/lib/YaST2/reconfig_system
 OnFailure=shutdown.target
 
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' 
old/yast2-installation-4.5.0/package/YaST2-Second-Stage.service 
new/yast2-installation-4.5.1/package/YaST2-Second-Stage.service
--- old/yast2-installation-4.5.0/package/YaST2-Second-Stage.service     
2022-04-12 13:34:42.000000000 +0200
+++ new/yast2-installation-4.5.1/package/YaST2-Second-Stage.service     
2022-04-27 15:31:53.000000000 +0200
@@ -10,8 +10,8 @@
 Before=getty@tty1.service getty@tty2.service getty@tty3.service 
getty@tty4.service getty@tty5.service getty@tty6.service
 Before=serial-getty@ttyS0.service serial-getty@ttyS1.service 
serial-getty@ttyS2.service
 Before=serial-getty@hvc0.service serial-getty@ttyAMA0.service 
serial-getty@ttysclp0.service
-# Prevent too early user login (bsc#1196594) and too early vnc connection 
(bsc#1197265)
-Before=display-manager.service xvnc.socket
+# Prevent too early user login (bsc#1196594)
+Before=display-manager.service
 ConditionPathExists=/var/lib/YaST2/runme_at_boot
 
 [Service]
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' 
old/yast2-installation-4.5.0/package/yast2-installation.changes 
new/yast2-installation-4.5.1/package/yast2-installation.changes
--- old/yast2-installation-4.5.0/package/yast2-installation.changes     
2022-04-12 13:34:42.000000000 +0200
+++ new/yast2-installation-4.5.1/package/yast2-installation.changes     
2022-04-27 15:31:53.000000000 +0200
@@ -1,4 +1,11 @@
 -------------------------------------------------------------------
+Mon Apr 25 23:10:17 UTC 2022 - Knut Anderssen <kanders...@suse.com>
+
+- Revert changes introduced in v4.3.50 as it produces some ordering
+  cycle issues (bsc#1198294)
+- 4.5.1
+
+-------------------------------------------------------------------
 Wed Apr 06 13:24:58 UTC 2022 - Ladislav Slez??k <lsle...@suse.cz>
 
 - Bump version to 4.5.0 (bsc#1198109)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' 
old/yast2-installation-4.5.0/package/yast2-installation.spec 
new/yast2-installation-4.5.1/package/yast2-installation.spec
--- old/yast2-installation-4.5.0/package/yast2-installation.spec        
2022-04-12 13:34:42.000000000 +0200
+++ new/yast2-installation-4.5.1/package/yast2-installation.spec        
2022-04-27 15:31:53.000000000 +0200
@@ -16,7 +16,7 @@
 #
 
 Name:           yast2-installation
-Version:        4.5.0
+Version:        4.5.1
 Release:        0
 Summary:        YaST2 - Installation Parts
 License:        GPL-2.0-only
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' 
old/yast2-installation-4.5.0/startup/First-Stage/F08-logging 
new/yast2-installation-4.5.1/startup/First-Stage/F08-logging
--- old/yast2-installation-4.5.0/startup/First-Stage/F08-logging        
2022-04-12 13:34:42.000000000 +0200
+++ new/yast2-installation-4.5.1/startup/First-Stage/F08-logging        
2022-04-27 15:31:53.000000000 +0200
@@ -31,12 +31,12 @@
     if [ "$USE" -gt "$Y2LOG_DEFAULT_MIN_SIZE" ]; then
         # more than the maximum default
         if [ "$USE" -gt "$Y2LOG_DEFAULT_MAX_SIZE" ]; then
-               export Y2MAXLOGSIZE=$Y2LOG_DEFAULT_MAX_SIZE
+               export Y2MAXLOGSIZE="$Y2LOG_DEFAULT_MAX_SIZE"
         else
-               export Y2MAXLOGSIZE=$USE
+               export Y2MAXLOGSIZE="$USE"
         fi
     else
-        export Y2MAXLOGSIZE=$Y2LOG_DEFAULT_MIN_SIZE
+        export Y2MAXLOGSIZE="$Y2LOG_DEFAULT_MIN_SIZE"
     fi
 fi
 
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' 
old/yast2-installation-4.5.0/startup/Second-Stage/S09-cleanup 
new/yast2-installation-4.5.1/startup/Second-Stage/S09-cleanup
--- old/yast2-installation-4.5.0/startup/Second-Stage/S09-cleanup       
2022-04-12 13:34:42.000000000 +0200
+++ new/yast2-installation-4.5.1/startup/Second-Stage/S09-cleanup       
2022-04-27 15:31:53.000000000 +0200
@@ -15,6 +15,7 @@
        log "\tkill all VNC sessions..."
        killall Xvnc >/dev/null 2>&1
        rm -fv /root/.vnc/passwd.yast
+       restore_xvnc
 fi
 # 13.3) stop network and sshd
 if [ "$Y2_NETWORK_ACTIVE" -ne 0 ] ; then
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/yast2-installation-4.5.0/startup/YaST2.call 
new/yast2-installation-4.5.1/startup/YaST2.call
--- old/yast2-installation-4.5.0/startup/YaST2.call     2022-04-12 
13:34:42.000000000 +0200
+++ new/yast2-installation-4.5.1/startup/YaST2.call     2022-04-27 
15:31:53.000000000 +0200
@@ -216,6 +216,7 @@
        if [ $VNCPASS_EXCEPTION = 0 ];then
                disable_splash
                displayVNCMessage
+               stop_xvnc
                startVNCServer
                wait_for_x11
                if [ "$server_running" = 1 ];then
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/yast2-installation-4.5.0/startup/common/misc.sh 
new/yast2-installation-4.5.1/startup/common/misc.sh
--- old/yast2-installation-4.5.0/startup/common/misc.sh 2022-04-12 
13:34:42.000000000 +0200
+++ new/yast2-installation-4.5.1/startup/common/misc.sh 2022-04-27 
15:31:53.000000000 +0200
@@ -187,6 +187,36 @@
        [ -f /proc/splash ] && echo "verbose" > /proc/splash
 }
 
+#----[ stop_xvnc]-----#
+function stop_xvnc () {
+#--------------------------------------------------
+# stop xvnc since its default configuration collides
+# with the Xvnc server used for VNC installation
+# ---
+       systemctl stop xvnc.socket >/dev/null 2>&1
+# stop also running instances of xvnc to allow start our own
+        systemctl stop xvnc@* >/dev/null 2>&1
+}
+
+#----[ is_xvnc_enabled ]-----#
+function is_xvnc_enabled () {
+# return 0 if xvnc is enabled
+# ---
+       systemctl --quiet is-enabled xvnc.socket >/dev/null 2>&1
+       return $?
+}
+
+#----[ restore_xvnc ]-----#
+function restore_xvnc () {
+#--------------------------------------------------
+# start xvnc again if it is enabled, once the Xvnc
+# server already owns its port
+# ---
+       if is_xvnc_enabled; then
+               systemctl start xvnc.socket
+       fi
+}
+
 #----[ have_pid ]----#
 function have_pid () {
 #------------------------------------------------------

Reply via email to