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-03-23 20:15:23
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/yast2-installation (Old)
 and      /work/SRC/openSUSE:Factory/.yast2-installation.new.25692 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Package is "yast2-installation"

Wed Mar 23 20:15:23 2022 rev:501 rq:963378 version:4.4.50

Changes:
--------
--- /work/SRC/openSUSE:Factory/yast2-installation/yast2-installation.changes    
2022-03-20 20:54:30.458436596 +0100
+++ 
/work/SRC/openSUSE:Factory/.yast2-installation.new.25692/yast2-installation.changes
 2022-03-23 20:15:29.694365158 +0100
@@ -1,0 +2,8 @@
+Fri Mar 18 11:20:47 UTC 2022 - Knut Anderssen <kanders...@suse.com>
+
+- Do not stop xvnc.socket but run the YaST2-Second-Stage and
+  YaST2-Firsboot services before it in order to prevent early
+  vnc connections (bsc#1197265)
+-4.4.50
+
+-------------------------------------------------------------------

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

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

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

Other differences:
------------------
++++++ yast2-installation.spec ++++++
--- /var/tmp/diff_new_pack.tPtA4k/_old  2022-03-23 20:15:30.934365802 +0100
+++ /var/tmp/diff_new_pack.tPtA4k/_new  2022-03-23 20:15:30.942365805 +0100
@@ -17,7 +17,7 @@
 
 
 Name:           yast2-installation
-Version:        4.4.49
+Version:        4.4.50
 Release:        0
 Summary:        YaST2 - Installation Parts
 License:        GPL-2.0-only

++++++ YaST2-Firstboot.service ++++++
--- /var/tmp/diff_new_pack.tPtA4k/_old  2022-03-23 20:15:30.990365831 +0100
+++ /var/tmp/diff_new_pack.tPtA4k/_new  2022-03-23 20:15:31.002365837 +0100
@@ -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
+Before=display-manager.service xvnc.socket
 ConditionPathExists=/var/lib/YaST2/reconfig_system
 OnFailure=shutdown.target
 

++++++ YaST2-Second-Stage.service ++++++
--- /var/tmp/diff_new_pack.tPtA4k/_old  2022-03-23 20:15:31.054365863 +0100
+++ /var/tmp/diff_new_pack.tPtA4k/_new  2022-03-23 20:15:31.062365868 +0100
@@ -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)
-Before=display-manager.service
+# Prevent too early user login (bsc#1196594) and too early vnc connection 
(bsc#1197265)
+Before=display-manager.service xvnc.socket
 ConditionPathExists=/var/lib/YaST2/runme_at_boot
 
 [Service]

++++++ yast2-installation-4.4.49.tar.bz2 -> yast2-installation-4.4.50.tar.bz2 
++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' 
old/yast2-installation-4.4.49/package/YaST2-Firstboot.service 
new/yast2-installation-4.4.50/package/YaST2-Firstboot.service
--- old/yast2-installation-4.4.49/package/YaST2-Firstboot.service       
2022-03-17 17:13:51.000000000 +0100
+++ new/yast2-installation-4.4.50/package/YaST2-Firstboot.service       
2022-03-21 01:43:50.000000000 +0100
@@ -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
+Before=display-manager.service xvnc.socket
 ConditionPathExists=/var/lib/YaST2/reconfig_system
 OnFailure=shutdown.target
 
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' 
old/yast2-installation-4.4.49/package/YaST2-Second-Stage.service 
new/yast2-installation-4.4.50/package/YaST2-Second-Stage.service
--- old/yast2-installation-4.4.49/package/YaST2-Second-Stage.service    
2022-03-17 17:13:51.000000000 +0100
+++ new/yast2-installation-4.4.50/package/YaST2-Second-Stage.service    
2022-03-21 01:43:50.000000000 +0100
@@ -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)
-Before=display-manager.service
+# Prevent too early user login (bsc#1196594) and too early vnc connection 
(bsc#1197265)
+Before=display-manager.service xvnc.socket
 ConditionPathExists=/var/lib/YaST2/runme_at_boot
 
 [Service]
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' 
old/yast2-installation-4.4.49/package/yast2-installation.changes 
new/yast2-installation-4.4.50/package/yast2-installation.changes
--- old/yast2-installation-4.4.49/package/yast2-installation.changes    
2022-03-17 17:13:51.000000000 +0100
+++ new/yast2-installation-4.4.50/package/yast2-installation.changes    
2022-03-21 01:43:50.000000000 +0100
@@ -1,4 +1,12 @@
 -------------------------------------------------------------------
+Fri Mar 18 11:20:47 UTC 2022 - Knut Anderssen <kanders...@suse.com>
+
+- Do not stop xvnc.socket but run the YaST2-Second-Stage and
+  YaST2-Firsboot services before it in order to prevent early
+  vnc connections (bsc#1197265)
+-4.4.50
+
+-------------------------------------------------------------------
 Thu Mar 17 12:46:16 UTC 2022 - Knut Anderssen <kanders...@suse.com>
 
 - Run the YaST2-Second-Stage and YaST2-Firsboot services after
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' 
old/yast2-installation-4.4.49/package/yast2-installation.spec 
new/yast2-installation-4.4.50/package/yast2-installation.spec
--- old/yast2-installation-4.4.49/package/yast2-installation.spec       
2022-03-17 17:13:51.000000000 +0100
+++ new/yast2-installation-4.4.50/package/yast2-installation.spec       
2022-03-21 01:43:50.000000000 +0100
@@ -16,7 +16,7 @@
 #
 
 Name:           yast2-installation
-Version:        4.4.49
+Version:        4.4.50
 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.4.49/startup/Second-Stage/S09-cleanup 
new/yast2-installation-4.4.50/startup/Second-Stage/S09-cleanup
--- old/yast2-installation-4.4.49/startup/Second-Stage/S09-cleanup      
2022-03-17 17:13:51.000000000 +0100
+++ new/yast2-installation-4.4.50/startup/Second-Stage/S09-cleanup      
2022-03-21 01:43:50.000000000 +0100
@@ -15,7 +15,6 @@
        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.4.49/startup/YaST2.call 
new/yast2-installation-4.4.50/startup/YaST2.call
--- old/yast2-installation-4.4.49/startup/YaST2.call    2022-03-17 
17:13:51.000000000 +0100
+++ new/yast2-installation-4.4.50/startup/YaST2.call    2022-03-21 
01:43:50.000000000 +0100
@@ -216,7 +216,6 @@
        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.4.49/startup/common/misc.sh 
new/yast2-installation-4.4.50/startup/common/misc.sh
--- old/yast2-installation-4.4.49/startup/common/misc.sh        2022-03-17 
17:13:51.000000000 +0100
+++ new/yast2-installation-4.4.50/startup/common/misc.sh        2022-03-21 
01:43:50.000000000 +0100
@@ -187,36 +187,6 @@
        [ -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