Hello community, here is the log from the commit of package yast2-installation for openSUSE:Factory checked in at 2015-10-20 16:21:54 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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-09-13 09:43:13.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.yast2-installation.new/yast2-installation.changes 2015-10-20 16:21:56.000000000 +0200 @@ -1,0 +2,14 @@ +Fri Oct 9 13:32:36 UTC 2015 - an...@suse.com + +- Language selection screen fixed to immediately apply the keyboard + layout after changing it automatically (bsc#947969). +- 3.1.161 + +------------------------------------------------------------------- +Thu Oct 1 15:55:54 UTC 2015 - an...@suse.com + +- Simplified second stage systemd unit to avoid dependencies cycles + (bnc#947521 and bnc#931643). Logic moved to YaST startup scripts. +- 3.1.160 + +------------------------------------------------------------------- Old: ---- yast2-installation-3.1.159.tar.bz2 New: ---- yast2-installation-3.1.161.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-installation.spec ++++++ --- /var/tmp/diff_new_pack.KvNnx2/_old 2015-10-20 16:21:57.000000000 +0200 +++ /var/tmp/diff_new_pack.KvNnx2/_new 2015-10-20 16:21:57.000000000 +0200 @@ -17,7 +17,7 @@ Name: yast2-installation -Version: 3.1.159 +Version: 3.1.161 Release: 0 BuildRoot: %{_tmppath}/%{name}-%{version}-build ++++++ YaST2-Second-Stage.service ++++++ --- /var/tmp/diff_new_pack.KvNnx2/_old 2015-10-20 16:21:57.000000000 +0200 +++ /var/tmp/diff_new_pack.KvNnx2/_new 2015-10-20 16:21:57.000000000 +0200 @@ -2,7 +2,7 @@ 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 xinetd.service +After=apparmor.service local-fs.target plymouth-start.service Before=getty@tty1.service display-manager.service network.service NetworkManager.service SuSEfirewall2_init.service SuSEfirewall2.service ConditionPathExists=/var/lib/YaST2/runme_at_boot ++++++ yast2-installation-3.1.159.tar.bz2 -> yast2-installation-3.1.161.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-installation-3.1.159/package/YaST2-Second-Stage.service new/yast2-installation-3.1.161/package/YaST2-Second-Stage.service --- old/yast2-installation-3.1.159/package/YaST2-Second-Stage.service 2015-09-04 09:24:11.000000000 +0200 +++ new/yast2-installation-3.1.161/package/YaST2-Second-Stage.service 2015-10-15 09:54:10.000000000 +0200 @@ -2,7 +2,7 @@ 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 xinetd.service +After=apparmor.service local-fs.target plymouth-start.service Before=getty@tty1.service 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.159/package/yast2-installation.changes new/yast2-installation-3.1.161/package/yast2-installation.changes --- old/yast2-installation-3.1.159/package/yast2-installation.changes 2015-09-04 09:24:11.000000000 +0200 +++ new/yast2-installation-3.1.161/package/yast2-installation.changes 2015-10-15 09:54:10.000000000 +0200 @@ -1,4 +1,18 @@ ------------------------------------------------------------------- +Fri Oct 9 13:32:36 UTC 2015 - an...@suse.com + +- Language selection screen fixed to immediately apply the keyboard + layout after changing it automatically (bsc#947969). +- 3.1.161 + +------------------------------------------------------------------- +Thu Oct 1 15:55:54 UTC 2015 - an...@suse.com + +- Simplified second stage systemd unit to avoid dependencies cycles + (bnc#947521 and bnc#931643). Logic moved to YaST startup scripts. +- 3.1.160 + +------------------------------------------------------------------- Fri Sep 4 07:07:33 UTC 2015 - jsr...@suse.cz - fix bug preventing to finish proposal in some sutuations diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-installation-3.1.159/package/yast2-installation.spec new/yast2-installation-3.1.161/package/yast2-installation.spec --- old/yast2-installation-3.1.159/package/yast2-installation.spec 2015-09-04 09:24:11.000000000 +0200 +++ new/yast2-installation-3.1.161/package/yast2-installation.spec 2015-10-15 09:54:10.000000000 +0200 @@ -17,7 +17,7 @@ Name: yast2-installation -Version: 3.1.159 +Version: 3.1.161 Release: 0 BuildRoot: %{_tmppath}/%{name}-%{version}-build diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-installation-3.1.159/src/lib/installation/clients/inst_complex_welcome.rb new/yast2-installation-3.1.161/src/lib/installation/clients/inst_complex_welcome.rb --- old/yast2-installation-3.1.159/src/lib/installation/clients/inst_complex_welcome.rb 2015-09-04 09:24:11.000000000 +0200 +++ new/yast2-installation-3.1.161/src/lib/installation/clients/inst_complex_welcome.rb 2015-10-15 09:54:10.000000000 +0200 @@ -203,6 +203,7 @@ else @kbd = Keyboard.GetKeyboardForLanguage(@language, "english-us") UI.ChangeWidget(Id(:keyboard), :Value, @kbd) + Keyboard.Set(@kbd) end # In case of going back, Release Notes button may be shown, retranslate it (bnc#886660) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-installation-3.1.159/src/lib/installation/clients/inst_pre_install.rb new/yast2-installation-3.1.161/src/lib/installation/clients/inst_pre_install.rb --- old/yast2-installation-3.1.159/src/lib/installation/clients/inst_pre_install.rb 2015-09-04 09:24:11.000000000 +0200 +++ new/yast2-installation-3.1.161/src/lib/installation/clients/inst_pre_install.rb 2015-10-15 09:54:10.000000000 +0200 @@ -293,10 +293,10 @@ device_names = restrict_disk_names.call(device_names) Builtins.foreach(device_names) do |device_name| device_descr = Ops.get(target_map, device_name, {}) - partitons = Ops.get_list(device_descr, "partitions", []) + partitions = Ops.get_list(device_descr, "partitions", []) filesystem = nil devicename = nil - Builtins.foreach(partitons) do |partition| + Builtins.foreach(partitions) do |partition| filesystem = Ops.get_symbol( partition, "used_fs", @@ -328,7 +328,7 @@ end end - Builtins.y2milestone("Possible partitons: %1", @useful_partitions) + Builtins.y2milestone("Possible partitions: %1", @useful_partitions) nil end diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-installation-3.1.159/src/modules/SystemFilesCopy.rb new/yast2-installation-3.1.161/src/modules/SystemFilesCopy.rb --- old/yast2-installation-3.1.159/src/modules/SystemFilesCopy.rb 2015-09-04 09:24:11.000000000 +0200 +++ new/yast2-installation-3.1.161/src/modules/SystemFilesCopy.rb 2015-10-15 09:54:10.000000000 +0200 @@ -138,7 +138,7 @@ # # **Structure:** # - # partiton == "/dev/sdb4" + # partition == "/dev/sdb4" # # **Structure:** # diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-installation-3.1.159/startup/YaST2.call new/yast2-installation-3.1.161/startup/YaST2.call --- old/yast2-installation-3.1.159/startup/YaST2.call 2015-09-04 09:24:11.000000000 +0200 +++ new/yast2-installation-3.1.161/startup/YaST2.call 2015-10-15 09:54:10.000000000 +0200 @@ -158,9 +158,24 @@ setupVNCAuthentication if [ $VNCPASS_EXCEPTION = 0 ];then disable_splash - disable_xinetd + displayVNCMessage + stop_xinetd 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" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-installation-3.1.159/startup/common/misc.sh new/yast2-installation-3.1.161/startup/common/misc.sh --- old/yast2-installation-3.1.159/startup/common/misc.sh 2015-09-04 09:24:11.000000000 +0200 +++ new/yast2-installation-3.1.161/startup/common/misc.sh 2015-10-15 09:54:10.000000000 +0200 @@ -186,8 +186,8 @@ [ -f /proc/splash ] && echo "verbose" > /proc/splash } -#----[ disable_xinetd ]-----# -function disable_xinetd () { +#----[ stop_xinetd ]-----# +function stop_xinetd () { #-------------------------------------------------- # stop xinetd since its default configuration collides # with the Xvnc server used for VNC installation @@ -195,14 +195,29 @@ systemctl stop xinetd.service >/dev/null 2>&1 } +#----[ is_xinetd_enabled ]-----# +function is_xinetd_enabled () { +# return 0 if xinetd is enabled +# --- + systemctl --quiet is-enabled xinetd.service >/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 () { #-------------------------------------------------- # 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 + if is_xinetd_enabled; then systemctl start xinetd.service fi } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-installation-3.1.159/startup/common/vnc.sh new/yast2-installation-3.1.161/startup/common/vnc.sh --- old/yast2-installation-3.1.159/startup/common/vnc.sh 2015-09-04 09:24:11.000000000 +0200 +++ new/yast2-installation-3.1.161/startup/common/vnc.sh 2015-10-15 09:54:10.000000000 +0200 @@ -38,15 +38,14 @@ fi } -#----[ startVNCServer ]------# -startVNCServer () { +#----[ displayVNCMessage ]------# +displayVNCMessage () { #--------------------------------------------------- -# start Xvnc server and write a log file from the -# VNC server process +# inform the user that VNC server is going to be executed and provide +# instructions on how to connect to it # # The IP set in install.inf may not be valid if the DHCP server # gave us a different lease in the meantime (#43974). - echo echo starting VNC server... echo A log file will be written to: /var/log/YaST2/vncserver.log ... @@ -64,13 +63,17 @@ EOF list_ifaces echo +} - #========================================== - # Start Xvnc... - # For -noreset see BNC #351338 - #------------------------------------------ +#----[ startVNCServer ]------# +startVNCServer () { +#--------------------------------------------------- +# start Xvnc server and write a log file from the +# VNC server process +# [ -z "$VNCSize" ] && VNCSize=1024x768 + # For -noreset see BNC #351338 $Xbindir/Xvnc $Xvncparam :0 \ -noreset \ -rfbauth /root/.vnc/passwd.yast \