Hello community,
here is the log from the commit of package yast2-installation for
openSUSE:Factory checked in at 2015-04-27 12:58:43
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/yast2-installation (Old)
and /work/SRC/openSUSE:Factory/.yast2-installation.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "yast2-installation"
Changes:
--------
--- /work/SRC/openSUSE:Factory/yast2-installation/yast2-installation.changes
2015-04-22 01:12:48.000000000 +0200
+++
/work/SRC/openSUSE:Factory/.yast2-installation.new/yast2-installation.changes
2015-04-27 12:58:45.000000000 +0200
@@ -1,0 +2,7 @@
+Fri Apr 24 06:01:14 UTC 2015 - [email protected]
+
+- Fixed an error preventing the VNC connection during second
+ installation stage of AutoYaST when using VNC=1 (bnc#923901)
+- 3.1.141
+
+-------------------------------------------------------------------
Old:
----
yast2-installation-3.1.140.tar.bz2
New:
----
yast2-installation-3.1.141.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ yast2-installation.spec ++++++
--- /var/tmp/diff_new_pack.s7yxt6/_old 2015-04-27 12:58:46.000000000 +0200
+++ /var/tmp/diff_new_pack.s7yxt6/_new 2015-04-27 12:58:46.000000000 +0200
@@ -17,7 +17,7 @@
Name: yast2-installation
-Version: 3.1.140
+Version: 3.1.141
Release: 0
BuildRoot: %{_tmppath}/%{name}-%{version}-build
++++++ YaST2-Second-Stage.service ++++++
--- /var/tmp/diff_new_pack.s7yxt6/_old 2015-04-27 12:58:46.000000000 +0200
+++ /var/tmp/diff_new_pack.s7yxt6/_new 2015-04-27 12:58:46.000000000 +0200
@@ -1,6 +1,8 @@
[Unit]
Description=YaST2 Second Stage
-After=apparmor.service local-fs.target plymouth-start.service
+# 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 xinetd.service
[email protected] display-manager.service network.service
NetworkManager.service SuSEfirewall2_init.service SuSEfirewall2.service
ConditionPathExists=/var/lib/YaST2/runme_at_boot
++++++ yast2-installation-3.1.140.tar.bz2 -> yast2-installation-3.1.141.tar.bz2
++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/yast2-installation-3.1.140/package/YaST2-Second-Stage.service
new/yast2-installation-3.1.141/package/YaST2-Second-Stage.service
--- old/yast2-installation-3.1.140/package/YaST2-Second-Stage.service
2015-04-20 13:39:13.000000000 +0200
+++ new/yast2-installation-3.1.141/package/YaST2-Second-Stage.service
2015-04-24 13:59:08.000000000 +0200
@@ -1,6 +1,8 @@
[Unit]
Description=YaST2 Second Stage
-After=apparmor.service local-fs.target plymouth-start.service
+# 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 xinetd.service
[email protected] display-manager.service network.service
NetworkManager.service SuSEfirewall2_init.service SuSEfirewall2.service
ConditionPathExists=/var/lib/YaST2/runme_at_boot
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/yast2-installation-3.1.140/package/yast2-installation.changes
new/yast2-installation-3.1.141/package/yast2-installation.changes
--- old/yast2-installation-3.1.140/package/yast2-installation.changes
2015-04-20 13:39:13.000000000 +0200
+++ new/yast2-installation-3.1.141/package/yast2-installation.changes
2015-04-24 13:59:08.000000000 +0200
@@ -1,4 +1,11 @@
-------------------------------------------------------------------
+Fri Apr 24 06:01:14 UTC 2015 - [email protected]
+
+- Fixed an error preventing the VNC connection during second
+ installation stage of AutoYaST when using VNC=1 (bnc#923901)
+- 3.1.141
+
+-------------------------------------------------------------------
Wed Apr 20 13:11:40 CEST 2015 - [email protected]
- Fixed differnt bugs in proposal overview with multiple tabs.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/yast2-installation-3.1.140/package/yast2-installation.spec
new/yast2-installation-3.1.141/package/yast2-installation.spec
--- old/yast2-installation-3.1.140/package/yast2-installation.spec
2015-04-20 13:39:13.000000000 +0200
+++ new/yast2-installation-3.1.141/package/yast2-installation.spec
2015-04-24 13:59:08.000000000 +0200
@@ -17,7 +17,7 @@
Name: yast2-installation
-Version: 3.1.140
+Version: 3.1.141
Release: 0
BuildRoot: %{_tmppath}/%{name}-%{version}-build
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/yast2-installation-3.1.140/startup/Second-Stage/S09-cleanup
new/yast2-installation-3.1.141/startup/Second-Stage/S09-cleanup
--- old/yast2-installation-3.1.140/startup/Second-Stage/S09-cleanup
2015-04-20 13:39:13.000000000 +0200
+++ new/yast2-installation-3.1.141/startup/Second-Stage/S09-cleanup
2015-04-24 13:59:08.000000000 +0200
@@ -10,11 +10,13 @@
log "\tkill console with PID: $SPID"
kill -KILL $SPID >/dev/null 2>&1
fi
-# 13.2) kill VNC server and remove VNC passwd
+# 13.2) kill VNC server, VNC passwd and allow
+# xinetd to control de VNC port again
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
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-3.1.140/startup/YaST2.call
new/yast2-installation-3.1.141/startup/YaST2.call
--- old/yast2-installation-3.1.140/startup/YaST2.call 2015-04-20
13:39:13.000000000 +0200
+++ new/yast2-installation-3.1.141/startup/YaST2.call 2015-04-24
13:59:08.000000000 +0200
@@ -158,8 +158,10 @@
setupVNCAuthentication
if [ $VNCPASS_EXCEPTION = 0 ];then
disable_splash
+ disable_xinetd
startVNCServer
wait_for_x11
+ 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-3.1.140/startup/common/misc.sh
new/yast2-installation-3.1.141/startup/common/misc.sh
--- old/yast2-installation-3.1.140/startup/common/misc.sh 2015-04-20
13:39:13.000000000 +0200
+++ new/yast2-installation-3.1.141/startup/common/misc.sh 2015-04-24
13:59:08.000000000 +0200
@@ -186,6 +186,27 @@
[ -f /proc/splash ] && echo "verbose" > /proc/splash
}
+#----[ disable_xinetd ]-----#
+function disable_xinetd () {
+#--------------------------------------------------
+# stop xinetd since its default configuration collides
+# with the Xvnc server used for VNC installation
+# ---
+ systemctl stop xinetd.service >/dev/null 2>&1
+}
+
+#----[ restore_xinetd ]-----#
+function restore_xinetd () {
+#--------------------------------------------------
+# start xinetd again if it is enabled, once the Xvnc
+# server already owns its port
+# ---
+ systemctl --quiet is-enabled xinetd.service >/dev/null 2>&1
+ if [ $? -eq 0 ]; then
+ systemctl start xinetd.service
+ fi
+}
+
#----[ have_pid ]----#
function have_pid () {
#------------------------------------------------------
