Hello community,

here is the log from the commit of package yast2-installation for 
openSUSE:Factory checked in at 2018-02-13 10:23:31
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/yast2-installation (Old)
 and      /work/SRC/openSUSE:Factory/.yast2-installation.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Package is "yast2-installation"

Tue Feb 13 10:23:31 2018 rev:395 rq:575521 version:4.0.32

Changes:
--------
--- /work/SRC/openSUSE:Factory/yast2-installation/yast2-installation.changes    
2018-02-07 18:18:25.128825073 +0100
+++ 
/work/SRC/openSUSE:Factory/.yast2-installation.new/yast2-installation.changes   
    2018-02-13 10:23:33.577726787 +0100
@@ -1,0 +2,9 @@
+Thu Feb  8 13:55:21 UTC 2018 - knut.anders...@suse.com
+
+- Startup scripts: Replaced xinetd by xvnc.socket (fate#323373)
+- Revert changes added in 4.0.29 bringing back the enablement of
+  the xvnc.socket during the first stage if Linuxrc.vnc is set.
+  (bnc#1077236)
+- 4.0.32
+
+-------------------------------------------------------------------

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

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

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

Other differences:
------------------
++++++ yast2-installation.spec ++++++
--- /var/tmp/diff_new_pack.HApM9Y/_old  2018-02-13 10:23:34.413696669 +0100
+++ /var/tmp/diff_new_pack.HApM9Y/_new  2018-02-13 10:23:34.413696669 +0100
@@ -17,7 +17,7 @@
 
 
 Name:           yast2-installation
-Version:        4.0.31
+Version:        4.0.32
 Release:        0
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build

++++++ YaST2-Second-Stage.service ++++++
--- /var/tmp/diff_new_pack.HApM9Y/_old  2018-02-13 10:23:34.453695227 +0100
+++ /var/tmp/diff_new_pack.HApM9Y/_new  2018-02-13 10:23:34.453695227 +0100
@@ -1,7 +1,5 @@
 [Unit]
 Description=YaST2 Second Stage
-# If xinetd is enabled, make sure it's already running so we can stop it during
-# initialization of the VNC server
 After=apparmor.service local-fs.target plymouth-start.service
 Conflicts=plymouth-start.service
 Before=getty@tty1.service serial-getty@ttyS0.service 
serial-getty@ttyS1.service serial-getty@ttyS2.service

++++++ yast2-installation-4.0.31.tar.bz2 -> yast2-installation-4.0.32.tar.bz2 
++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' 
old/yast2-installation-4.0.31/package/YaST2-Second-Stage.service 
new/yast2-installation-4.0.32/package/YaST2-Second-Stage.service
--- old/yast2-installation-4.0.31/package/YaST2-Second-Stage.service    
2018-02-06 12:31:01.000000000 +0100
+++ new/yast2-installation-4.0.32/package/YaST2-Second-Stage.service    
2018-02-12 10:38:28.000000000 +0100
@@ -1,7 +1,5 @@
 [Unit]
 Description=YaST2 Second Stage
-# If xinetd is enabled, make sure it's already running so we can stop it during
-# initialization of the VNC server
 After=apparmor.service local-fs.target plymouth-start.service
 Conflicts=plymouth-start.service
 Before=getty@tty1.service serial-getty@ttyS0.service 
serial-getty@ttyS1.service serial-getty@ttyS2.service
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' 
old/yast2-installation-4.0.31/package/yast2-installation.changes 
new/yast2-installation-4.0.32/package/yast2-installation.changes
--- old/yast2-installation-4.0.31/package/yast2-installation.changes    
2018-02-06 12:31:01.000000000 +0100
+++ new/yast2-installation-4.0.32/package/yast2-installation.changes    
2018-02-12 10:38:28.000000000 +0100
@@ -1,4 +1,13 @@
 -------------------------------------------------------------------
+Thu Feb  8 13:55:21 UTC 2018 - knut.anders...@suse.com
+
+- Startup scripts: Replaced xinetd by xvnc.socket (fate#323373)
+- Revert changes added in 4.0.29 bringing back the enablement of
+  the xvnc.socket during the first stage if Linuxrc.vnc is set.
+  (bnc#1077236)
+- 4.0.32
+
+-------------------------------------------------------------------
 Tue Feb  6 12:24:34 CET 2018 - sch...@suse.de
 
 - Added requirement iproute2 to spec file. This is needed by
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' 
old/yast2-installation-4.0.31/package/yast2-installation.spec 
new/yast2-installation-4.0.32/package/yast2-installation.spec
--- old/yast2-installation-4.0.31/package/yast2-installation.spec       
2018-02-06 12:31:01.000000000 +0100
+++ new/yast2-installation-4.0.32/package/yast2-installation.spec       
2018-02-12 10:38:28.000000000 +0100
@@ -16,7 +16,7 @@
 #
 
 Name:           yast2-installation
-Version:        4.0.31
+Version:        4.0.32
 Release:        0
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' 
old/yast2-installation-4.0.31/src/lib/installation/remote_finish_client.rb 
new/yast2-installation-4.0.32/src/lib/installation/remote_finish_client.rb
--- old/yast2-installation-4.0.31/src/lib/installation/remote_finish_client.rb  
2018-02-06 12:31:01.000000000 +0100
+++ new/yast2-installation-4.0.32/src/lib/installation/remote_finish_client.rb  
2018-02-12 10:38:28.000000000 +0100
@@ -50,7 +50,7 @@
           "when"  => modes
         }
       when "Write"
-        remote.write
+        enable_remote
       else
         log.error "unknown function: #{func}"
       end
@@ -67,13 +67,19 @@
       _("Enabling remote administration...")
     end
 
-    # Modes which will be used for writing settings
+    # Modes in which #enable_remote should be called
     #
     # @return [Array<Symbol>]
     def modes
       Yast::Linuxrc.vnc ? [:installation, :autoinst] : []
     end
 
+    # Enables remote access
+    def enable_remote
+      remote.enable!
+      remote.write
+    end
+
     def remote
       @remote ||= Y2Remote::Remote.instance
     end
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' 
old/yast2-installation-4.0.31/startup/Second-Stage/S09-cleanup 
new/yast2-installation-4.0.32/startup/Second-Stage/S09-cleanup
--- old/yast2-installation-4.0.31/startup/Second-Stage/S09-cleanup      
2018-02-06 12:31:01.000000000 +0100
+++ new/yast2-installation-4.0.32/startup/Second-Stage/S09-cleanup      
2018-02-12 10:38:28.000000000 +0100
@@ -10,13 +10,12 @@
        log "\tkill console with PID: $SPID"
        kill -KILL $SPID >/dev/null 2>&1
 fi
-# 13.2) kill VNC server, VNC passwd and allow
-#       xinetd to control de VNC port again
+# 13.2) kill VNC server, VNC passwd
 if [ ! -z "$VNC" ] && [ "$VNC" -eq 1 ] ; then
        log "\tkill all VNC sessions..."
        killall Xvnc >/dev/null 2>&1
        rm -fv /root/.vnc/passwd.yast
-       systemctl reload xinetd.service >/dev/null 2>&1
+       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.0.31/startup/YaST2.call 
new/yast2-installation-4.0.32/startup/YaST2.call
--- old/yast2-installation-4.0.31/startup/YaST2.call    2018-02-06 
12:31:01.000000000 +0100
+++ new/yast2-installation-4.0.32/startup/YaST2.call    2018-02-12 
10:38:28.000000000 +0100
@@ -165,24 +165,9 @@
        if [ $VNCPASS_EXCEPTION = 0 ];then
                disable_splash
                displayVNCMessage
-               stop_xinetd
+               stop_xvnc
                startVNCServer
                wait_for_x11
-               if is_xinetd_active; then
-                       # xinetd shouldn't be running since we stopped it right
-                       # before starting VNC. But there is still one small
-                       # chance that xinetd was started by the systemd boot
-                       # sequence during VNC startup. If it's running we cannot
-                       # be sure that our VNC got the ports, so retry.
-                       #
-                       # Using systemd dependencies to ensure the correct order
-                       # looks nicer, but is fragile (bnc#931643, bnc#947521).
-                       killall Xvnc >/dev/null 2>&1
-                       stop_xinetd
-                       startVNCServer
-                       wait_for_x11
-               fi
-               restore_xinetd
                if [ "$server_running" = 1 ];then
                        log "\tXvnc-Server is ready: $xserver_pid"
                fi
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/yast2-installation-4.0.31/startup/common/misc.sh 
new/yast2-installation-4.0.32/startup/common/misc.sh
--- old/yast2-installation-4.0.31/startup/common/misc.sh        2018-02-06 
12:31:01.000000000 +0100
+++ new/yast2-installation-4.0.32/startup/common/misc.sh        2018-02-12 
10:38:28.000000000 +0100
@@ -186,39 +186,33 @@
        [ -f /proc/splash ] && echo "verbose" > /proc/splash
 }
 
-#----[ stop_xinetd ]-----#
-function stop_xinetd () {
+#----[ stop_xvnc]-----#
+function stop_xvnc () {
 #--------------------------------------------------
-# stop xinetd since its default configuration collides
+# stop xvnc since its default configuration collides
 # with the Xvnc server used for VNC installation
 # ---
-       systemctl stop xinetd.service >/dev/null 2>&1
+       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_xinetd_enabled ]-----#
-function is_xinetd_enabled () {
-# return 0 if xinetd is enabled
+#----[ is_xvnc_enabled ]-----#
+function is_xvnc_enabled () {
+# return 0 if xvnc is enabled
 # ---
-       systemctl --quiet is-enabled xinetd.service >/dev/null 2>&1
+       systemctl --quiet is-enabled xvnc.socket >/dev/null 2>&1
        return $?
 }
 
-#----[ is_xinetd_active ]-----#
-function is_xinetd_active () {
-# return 0 if xinetd is currently running
-# ---
-       systemctl --quiet is-active xinetd.service >/dev/null 2>&1
-       return $?
-}
-
-#----[ restore_xinetd ]-----#
-function restore_xinetd () {
+#----[ restore_xvnc ]-----#
+function restore_xvnc () {
 #--------------------------------------------------
-# start xinetd again if it is enabled, once the Xvnc
+# start xvnc again if it is enabled, once the Xvnc
 # server already owns its port
 # ---
-       if is_xinetd_enabled; then
-               systemctl start xinetd.service
+       if is_xvnc_enabled; then
+               systemctl start xvnc.socket
        fi
 }
 
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/yast2-installation-4.0.31/test/remote_finish_test.rb 
new/yast2-installation-4.0.32/test/remote_finish_test.rb
--- old/yast2-installation-4.0.31/test/remote_finish_test.rb    2018-02-06 
12:31:01.000000000 +0100
+++ new/yast2-installation-4.0.32/test/remote_finish_test.rb    2018-02-12 
10:38:28.000000000 +0100
@@ -21,7 +21,7 @@
       end
 
       it "can be called as a WFM client with 'Write'" do
-        expect(remote).to receive(:write)
+        expect_any_instance_of(::Installation::RemoteFinishClient).to 
receive(:enable_remote)
         expect(Yast::WFM.CallFunction("remote_finish", ["Write"])).to be_nil
       end
     end
@@ -52,5 +52,13 @@
       end
     end
 
+    describe "#enable_remote" do
+      it "enables remote access" do
+        expect(remote).to receive(:enable!)
+        expect(remote).to receive(:write)
+
+        subject.enable_remote
+      end
+    end
   end
 end


Reply via email to