Hello community, here is the log from the commit of package yast2-installation for openSUSE:Factory checked in at 2020-01-24 14:10:24 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/yast2-installation (Old) and /work/SRC/openSUSE:Factory/.yast2-installation.new.26092 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "yast2-installation" Fri Jan 24 14:10:24 2020 rev:440 rq:766612 version:4.2.29 Changes: -------- --- /work/SRC/openSUSE:Factory/yast2-installation/yast2-installation.changes 2020-01-17 16:02:58.464371562 +0100 +++ /work/SRC/openSUSE:Factory/.yast2-installation.new.26092/yast2-installation.changes 2020-01-24 14:10:35.714397929 +0100 @@ -1,0 +2,13 @@ +Thu Jan 23 12:53:29 UTC 2020 - Steffen Winterfeldt <[email protected]> + +- don't use /bin/systemctl compat symlink (bsc#1160890) +- 4.2.29 + +------------------------------------------------------------------- +Wed Jan 22 13:44:48 CET 2020 - [email protected] +- Using tag $os_release_version in the control.xml file + (entry <self_update_url>) which will be replaced by the + value of VERSION in /etc/os-release. (improvement for fate#325834) +- 4.2.28 + +------------------------------------------------------------------- Old: ---- yast2-installation-4.2.27.tar.bz2 New: ---- yast2-installation-4.2.29.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-installation.spec ++++++ --- /var/tmp/diff_new_pack.NJQB9H/_old 2020-01-24 14:10:37.726398611 +0100 +++ /var/tmp/diff_new_pack.NJQB9H/_new 2020-01-24 14:10:37.734398613 +0100 @@ -17,7 +17,7 @@ Name: yast2-installation -Version: 4.2.27 +Version: 4.2.29 Release: 0 Summary: YaST2 - Installation Parts License: GPL-2.0-only @@ -36,8 +36,8 @@ BuildRequires: yast2-xml BuildRequires: rubygem(%{rb_default_ruby_abi}:rspec) BuildRequires: rubygem(%{rb_default_ruby_abi}:yast-rake) -# Y2Packager::ProductControlProduct -BuildRequires: yast2 >= 4.2.32 +# Yast::OSRelease.ReleaseVersionHumanReadable +BuildRequires: yast2 >= 4.2.56 # Y2Packager::MediumType BuildRequires: yast2-packager >= 4.2.27 # using /usr/bin/udevadm @@ -76,8 +76,8 @@ # Systemd default target and services. This version supports # writing settings in the first installation stage. Requires: yast2-services-manager >= 3.2.1 -# Y2Packager::ProductControlProduct -Requires: yast2 >= 4.2.32 +# Yast::OSRelease.ReleaseVersionHumanReadable +Requires: yast2 >= 4.2.56 Requires: yast2-network >= 4.0.13 # for AbortException and handle direct abort Requires: yast2-ruby-bindings >= 4.0.6 ++++++ yast2-installation-4.2.27.tar.bz2 -> yast2-installation-4.2.29.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-installation-4.2.27/doc/SELF_UPDATE.md new/yast2-installation-4.2.29/doc/SELF_UPDATE.md --- old/yast2-installation-4.2.27/doc/SELF_UPDATE.md 2020-01-15 10:31:43.000000000 +0100 +++ new/yast2-installation-4.2.29/doc/SELF_UPDATE.md 2020-01-23 14:15:30.000000000 +0100 @@ -147,7 +147,7 @@ ```xml <globals> - <self_update_url>http://updates.suse.com/sle12/$arch</self_update_url> + <self_update_url>https://updates.suse.com/SUSE/Updates/SLE-INSTALLER/$os_release_version/$arch/update</self_update_url> </globals> ``` diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-installation-4.2.27/doc/control-file.md new/yast2-installation-4.2.29/doc/control-file.md --- old/yast2-installation-4.2.27/doc/control-file.md 2020-01-15 10:31:43.000000000 +0100 +++ new/yast2-installation-4.2.29/doc/control-file.md 2020-01-23 14:15:30.000000000 +0100 @@ -998,8 +998,11 @@ repository should be defined in the control file. ``` - <self_update_url>http://updates.opensuse.org/$arch/leap-42.1-installer-update</self_update_url> + <self_update_url>https://updates.suse.com/SUSE/Updates/SLE-INSTALLER/$os_release_version/$arch/update</self_update_url</self_update_url> ``` +*$os_release_version* will be replaced by the *VERSION* entry in */etc/os-release* file. E.g. "15-SP2" +*$arch* reflects the architecture of the current installation system. + This is the fallback which is used if the self-update repository is not specified on the boot command line or if the registration module is not available. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-installation-4.2.27/package/yast2-installation.changes new/yast2-installation-4.2.29/package/yast2-installation.changes --- old/yast2-installation-4.2.27/package/yast2-installation.changes 2020-01-15 10:31:43.000000000 +0100 +++ new/yast2-installation-4.2.29/package/yast2-installation.changes 2020-01-23 14:15:30.000000000 +0100 @@ -1,4 +1,17 @@ ------------------------------------------------------------------- +Thu Jan 23 12:53:29 UTC 2020 - Steffen Winterfeldt <[email protected]> + +- don't use /bin/systemctl compat symlink (bsc#1160890) +- 4.2.29 + +------------------------------------------------------------------- +Wed Jan 22 13:44:48 CET 2020 - [email protected] +- Using tag $os_release_version in the control.xml file + (entry <self_update_url>) which will be replaced by the + value of VERSION in /etc/os-release. (improvement for fate#325834) +- 4.2.28 + +------------------------------------------------------------------- Wed Jan 15 10:22:58 CET 2020 - [email protected] - use udevadm in /usr/bin instead of /sbin (bsc#1160890) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-installation-4.2.27/package/yast2-installation.spec new/yast2-installation-4.2.29/package/yast2-installation.spec --- old/yast2-installation-4.2.27/package/yast2-installation.spec 2020-01-15 10:31:43.000000000 +0100 +++ new/yast2-installation-4.2.29/package/yast2-installation.spec 2020-01-23 14:15:30.000000000 +0100 @@ -16,7 +16,7 @@ # Name: yast2-installation -Version: 4.2.27 +Version: 4.2.29 Release: 0 Group: System/YaST License: GPL-2.0-only @@ -35,8 +35,8 @@ BuildRequires: yast2-xml BuildRequires: rubygem(%{rb_default_ruby_abi}:rspec) BuildRequires: rubygem(%{rb_default_ruby_abi}:yast-rake) -# Y2Packager::ProductControlProduct -BuildRequires: yast2 >= 4.2.32 +# Yast::OSRelease.ReleaseVersionHumanReadable +BuildRequires: yast2 >= 4.2.56 # Y2Packager::MediumType BuildRequires: yast2-packager >= 4.2.27 # using /usr/bin/udevadm @@ -75,8 +75,8 @@ # Systemd default target and services. This version supports # writing settings in the first installation stage. Requires: yast2-services-manager >= 3.2.1 -# Y2Packager::ProductControlProduct -Requires: yast2 >= 4.2.32 +# Yast::OSRelease.ReleaseVersionHumanReadable +Requires: yast2 >= 4.2.56 Requires: yast2-network >= 4.0.13 # for AbortException and handle direct abort Requires: yast2-ruby-bindings >= 4.0.6 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-installation-4.2.27/src/lib/installation/update_repositories_finder.rb new/yast2-installation-4.2.29/src/lib/installation/update_repositories_finder.rb --- old/yast2-installation-4.2.27/src/lib/installation/update_repositories_finder.rb 2020-01-15 10:31:43.000000000 +0100 +++ new/yast2-installation-4.2.29/src/lib/installation/update_repositories_finder.rb 2020-01-23 14:15:30.000000000 +0100 @@ -26,6 +26,7 @@ Yast.import "Profile" Yast.import "ProductFeatures" Yast.import "InstFunctions" +Yast.import "OSRelease" module Installation # Invalid registration URL error @@ -150,7 +151,8 @@ # Converts the string into an URI if it's valid # - # It substitutes $arch pattern with the architecture of the current system. + # Substituting $arch pattern with the architecture of the current system. + # Substituting $os_release_version pattern with the release of the current system. # # @return [URI,nil] The string converted into a URL; nil if it's # not a valid URL. @@ -159,6 +161,8 @@ def get_url_from(url) return nil unless url.is_a?(::String) real_url = url.gsub(/\$arch\b/, Yast::Pkg.GetArchitecture) + real_url = real_url.gsub(/\$os_release_version\b/, + Yast::OSRelease.ReleaseVersionHumanReadable) URI.regexp.match(real_url) ? URI(real_url) : nil end diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-installation-4.2.27/startup/Second-Stage/S07-medium new/yast2-installation-4.2.29/startup/Second-Stage/S07-medium --- old/yast2-installation-4.2.27/startup/Second-Stage/S07-medium 2020-01-15 10:31:43.000000000 +0100 +++ new/yast2-installation-4.2.29/startup/Second-Stage/S07-medium 2020-01-23 14:15:30.000000000 +0100 @@ -24,8 +24,8 @@ #--------------------------------------------- if [ ! -z "$(ls /etc/sysconfig/network/ifcfg-* |grep -v 'ifcfg-lo')" ]; then log "\tnetwork configuration found -> activate network" - /bin/systemctl start network && Y2_NETWORK_ACTIVE=1 - [ -f /var/lib/YaST2/network_install_rpcbind ] && /bin/systemctl start rpcbind + /usr/bin/systemctl start network && Y2_NETWORK_ACTIVE=1 + [ -f /var/lib/YaST2/network_install_rpcbind ] && /usr/bin/systemctl start rpcbind fi #============================================= @@ -38,7 +38,7 @@ if got_install_param '^UseSSH:.*1' ; then log "\tGot kernel parameter UseSSH -> export UseSSH variable" - /bin/systemctl start sshd && Y2_SSH_ACTIVE=1 + /usr/bin/systemctl start sshd && Y2_SSH_ACTIVE=1 export USE_SSH=1 fi log "\tSummary for commandline checks:" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-installation-4.2.27/startup/Second-Stage/S09-cleanup new/yast2-installation-4.2.29/startup/Second-Stage/S09-cleanup --- old/yast2-installation-4.2.27/startup/Second-Stage/S09-cleanup 2020-01-15 10:31:43.000000000 +0100 +++ new/yast2-installation-4.2.29/startup/Second-Stage/S09-cleanup 2020-01-23 14:15:30.000000000 +0100 @@ -20,7 +20,7 @@ # 13.3) stop network and sshd if [ "$Y2_NETWORK_ACTIVE" -ne 0 ] ; then log "\tShutdown SSH daemon and network interfaces..." - test -z "$Y2_SSH_ACTIVE" && /bin/systemctl stop sshd + test -z "$Y2_SSH_ACTIVE" && /usr/bin/systemctl stop sshd # # network mustn't be stopped when using systemd - systemd ignores @@ -28,14 +28,14 @@ # restart is used to force reconfiguration of network - first stage # config is used up to now. # - /bin/systemctl restart network + /usr/bin/systemctl restart network fi # 13.5) restart other services if necessary (bnc#395402) if [ -f /var/lib/YaST2/restart_services ] ; then cat /var/lib/YaST2/restart_services | while read service; do log "\tRestart $service service..." - /bin/systemctl restart $service + /usr/bin/systemctl restart $service done rm -f /var/lib/YaST2/restart_services fi
