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 2021-04-19 21:05:38 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/yast2-installation (Old) and /work/SRC/openSUSE:Factory/.yast2-installation.new.12324 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "yast2-installation" Mon Apr 19 21:05:38 2021 rev:467 rq:885917 version:4.4.4 Changes: -------- --- /work/SRC/openSUSE:Factory/yast2-installation/yast2-installation.changes 2021-04-10 15:26:21.542306585 +0200 +++ /work/SRC/openSUSE:Factory/.yast2-installation.new.12324/yast2-installation.changes 2021-04-19 21:05:46.404009047 +0200 @@ -1,0 +2,50 @@ +Fri Apr 16 10:19:04 UTC 2021 - Dirk M??ller <dmuel...@suse.com> + +- spec-cleaner part five out of five: sort and deduplicate requires +- 4.4.4 + +------------------------------------------------------------------- +Fri Apr 16 09:50:49 UTC 2021 - Dirk M??ller <dmuel...@suse.com> + +- spec-cleaner part two out of five: move conditionalized sections at the end +- spec-cleaner part three out of five: move weak requires (recommends) below requires +- spec-cleaner part four out of five: sort and deduplicate BuildRequires + +------------------------------------------------------------------- +Fri Apr 16 08:39:17 UTC 2021 - Dirk M??ller <dmuel...@suse.com> + +- remove check for non-systemd distros +- first out of 5 splits of "spec-cleaner -m -i *ec" run (for easier review) + +------------------------------------------------------------------- +Wed Apr 14 11:08:52 UTC 2021 - Knut Anderssen <kanders...@suse.com> + +- Show 'Default' in the proposal summary as the PolicyKit Default + Privileges to be used when it is not specified or specified as + empty in the control file (bsc#1184277) +- 4.4.3 + +------------------------------------------------------------------- +Wed Apr 14 09:46:38 UTC 2021 - Ludwig Nussel <lnus...@suse.com> + +- Check for usr/lib/modules to handle usrmerge (bsc#1029961) +- 4.4.2 + +------------------------------------------------------------------- +Wed Apr 14 08:44:31 UTC 2021 - Dominique Leuenberger <dims...@opensuse.org> + +- Do not own system directories (like /usr/bin) (bsc#1184787): + + filesystem is responsible to bring those directories with the + correct permission flags. Owning them here only introduces + races/conflicts. + + As a result: expand the files section for bindir and unitdir to + be exact on the files. + +------------------------------------------------------------------- +Fri Apr 9 16:21:31 UTC 2021 - Ladislav Slez??k <lsle...@suse.cz> + +- Start the "memsample" tool in a subshell to avoid "Terminated" + message displayed at the end (bsc#1184491) +- 4.4.1 + +------------------------------------------------------------------- Old: ---- yast2-installation-4.4.0.tar.bz2 New: ---- yast2-installation-4.4.4.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-installation.spec ++++++ --- /var/tmp/diff_new_pack.mnPZT3/_old 2021-04-19 21:05:47.068010043 +0200 +++ /var/tmp/diff_new_pack.mnPZT3/_new 2021-04-19 21:05:47.072010049 +0200 @@ -17,122 +17,114 @@ Name: yast2-installation -Version: 4.4.0 +Version: 4.4.4 Release: 0 Summary: YaST2 - Installation Parts License: GPL-2.0-only Group: System/YaST URL: https://github.com/yast/yast-installation - Source0: %{name}-%{version}.tar.bz2 Source1: YaST2-Second-Stage.service Source2: YaST2-Firstboot.service BuildRequires: update-desktop-files -BuildRequires: yast2-devtools >= 3.1.10 -# for AbortException and handle direct abort -BuildRequires: yast2-ruby-bindings >= 4.0.6 -# needed for xml agent reading about products -BuildRequires: yast2-xml -BuildRequires: rubygem(%{rb_default_ruby_abi}:rspec) -BuildRequires: rubygem(%{rb_default_ruby_abi}:yast-rake) # Yast2::FsSnapshotStore::IOError BuildRequires: yast2 >= 4.3.53 -# Y2Packager::MediumType -BuildRequires: yast2-packager >= 4.2.27 # CIOIgnore BuildRequires: yast2-bootloader -# For selinux classes -BuildRequires: yast2-security +# storage-ng based version +BuildRequires: yast2-country >= 3.3.1 +BuildRequires: yast2-devtools >= 3.1.10 # For firewall widgets BuildRequires: yast2-firewall -# using /usr/bin/udevadm -BuildRequires: yast2-storage-ng >= 4.2.71 # Y2Network::NtpServer BuildRequires: yast2-network >= 4.2.55 +# Y2Packager::MediumType +BuildRequires: yast2-packager >= 4.2.27 +# for AbortException and handle direct abort +BuildRequires: yast2-ruby-bindings >= 4.0.6 +# For selinux classes +BuildRequires: yast2-security +# using /usr/bin/udevadm +BuildRequires: yast2-storage-ng >= 4.2.71 # new root password cwm widget BuildRequires: yast2-users >= 3.2.8 -# storage-ng based version -BuildRequires: yast2-bootloader -BuildRequires: yast2-country >= 3.3.1 - -PreReq: %fillup_prereq -Requires: yast2-country >= 3.3.1 -Requires: yast2-users >= 3.2.8 -# tar-gzip some system files and untar-ungzip them after the installation (FATE #300421, #120103) +# needed for xml agent reading about products +BuildRequires: yast2-xml +BuildRequires: rubygem(%{rb_default_ruby_abi}:rspec) +BuildRequires: rubygem(%{rb_default_ruby_abi}:yast-rake) +# Augeas lenses +Requires: augeas-lenses Requires: coreutils Requires: gzip +# use in startup scripts +Requires: initviocons +# Needed call /sbin/ip in vnc.sh/network.sh +Requires: iproute2 +# for the first/second stage of installation +# currently not used +# bugzilla #208307 +#Requires: /usr/bin/jpegtopnm +#Requires: /usr/bin/pnmtopng +# BNC 446533, /sbin/lspci called but not installed +Requires: pciutils +# tar-gzip some system files and untar-ungzip them after the installation (FATE #300421, #120103) Requires: tar -# Augeas lenses -Requires: augeas-lenses -# Only in inst-sys -Requires: yast2-storage-ng >= 4.0.175 +# Yast2::FsSnapshotStore::IOError +Requires: yast2 >= 4.3.53 +# CIOIgnore +Requires: yast2-bootloader +Requires: yast2-country >= 3.3.1 # Language::GetLanguageItems and other API # Language::Set (handles downloading the translation extensions) Requires: yast2-country-data >= 2.16.11 -# Pkg::ProvidePackage -Requires: yast2-pkg-bindings >= 3.1.33 +# Y2Network::NtpServer +Requires: yast2-network >= 4.2.55 # Y2Packager::MediumType Requires: yast2-packager >= 4.2.22 -# CIOIgnore -Requires: yast2-bootloader -# use in startup scripts -Requires: initviocons +# Pkg::ProvidePackage +Requires: yast2-pkg-bindings >= 3.1.33 # Proxy settings for 2nd stage (bnc#764951) Requires: yast2-proxy +# for AbortException and handle direct abort +Requires: yast2-ruby-bindings >= 4.0.6 # Systemd default target and services. This version supports # writing settings in the first installation stage. Requires: yast2-services-manager >= 3.2.1 -# Yast2::FsSnapshotStore::IOError -Requires: yast2 >= 4.3.53 -# Y2Network::NtpServer -Requires: yast2-network >= 4.2.55 -# for AbortException and handle direct abort -Requires: yast2-ruby-bindings >= 4.0.6 -# for the first/second stage of installation -# currently not used -# bugzilla #208307 -#Requires: /usr/bin/jpegtopnm -#Requires: /usr/bin/pnmtopng -# BNC 446533, /sbin/lspci called but not installed -Requires: pciutils -# Needed call /sbin/ip in vnc.sh/network.sh -Requires: iproute2 -%if 0%{?suse_version} >= 1210 -%{systemd_requires} -%endif - +# Only in inst-sys +Requires: yast2-storage-ng >= 4.0.175 +Requires: yast2-users >= 3.2.8 +PreReq: %fillup_prereq +Recommends: yast2-add-on +Recommends: yast2-firewall +Recommends: yast2-online-update +Supplements: autoyast(deploy_image:ssh_import) +# new autoinst_files_finish call +Conflicts: autoyast2 < 4.3.26 # SingleItemSelector not enforcing an initial selection Conflicts: libyui < 3.8.2 -# Pkg::SourceProvideSignedFile Pkg::SourceProvideDigestedFile -# pkg-bindings are not directly required -Conflicts: yast2-pkg-bindings < 2.17.25 # InstError Conflicts: yast2 < 2.18.6 # storage-ng based version Conflicts: yast2-bootloader < 3.3.1 # Added new function WFM::ClientExists Conflicts: yast2-core < 2.17.10 -# Top bar with logo -Conflicts: yast2-ycp-ui-bindings < 3.1.7 -# Registration#get_updates_list does not handle exceptions -Conflicts: yast2-registration < 3.2.3 # Mouse-related scripts moved to yast2-mouse Conflicts: yast2-mouse < 2.18.0 -# new autoinst_files_finish call -Conflicts: autoyast2 < 4.3.26 +# Pkg::SourceProvideSignedFile Pkg::SourceProvideDigestedFile +# pkg-bindings are not directly required +Conflicts: yast2-pkg-bindings < 2.17.25 +# Registration#get_updates_list does not handle exceptions +Conflicts: yast2-registration < 3.2.3 # moved security_finish client Conflicts: yast2-security < 4.3.11 - +# Top bar with logo +Conflicts: yast2-ycp-ui-bindings < 3.1.7 Obsoletes: yast2-installation-devel-doc - -Recommends: yast2-online-update -Recommends: yast2-firewall -Recommends: yast2-add-on - -Supplements: autoyast(deploy_image:ssh_import) - BuildArch: noarch +%if 0%{?suse_version} >= 1210 +%{systemd_requires} +%endif %description System installation code as present on installation media. @@ -170,8 +162,6 @@ %post %{fillup_only -ns security checksig} -%if 0%{suse_version} > 1140 - %service_add_post YaST2-Second-Stage.service YaST2-Firstboot.service # bsc#924278 Always enable these services by default, they are already listed @@ -192,15 +182,15 @@ %postun %service_del_postun YaST2-Second-Stage.service YaST2-Firstboot.service -#suse_version -%endif - %files - # systemd service files -%{_unitdir} +%{_unitdir}/YaST2-Firstboot.service +%{_unitdir}/YaST2-Second-Stage.service +%{_bindir}/memsample +%{_bindir}/memsample-archive-to-csv +%{_bindir}/memsample-csv-plot # yupdate script -%{_bindir}/ +%{_bindir}/yupdate %{yast_clientdir} %{yast_moduledir} %{yast_desktopdir} ++++++ yast2-installation-4.4.0.tar.bz2 -> yast2-installation-4.4.4.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-installation-4.4.0/bin/memsample-csv-plot new/yast2-installation-4.4.4/bin/memsample-csv-plot --- old/yast2-installation-4.4.0/bin/memsample-csv-plot 2021-04-07 17:13:07.000000000 +0200 +++ new/yast2-installation-4.4.4/bin/memsample-csv-plot 2021-04-16 12:34:20.000000000 +0200 @@ -5,7 +5,7 @@ PNG="${2-memsample.png}" echo >&2 "Plotting from $CSV to $PNG" cat <<EOS | gnuplot > "$PNG" -set title "YaST instaler memory usage" +set title "YaST installer memory usage" set datafile separator comma set timefmt "%Y-%m-%dT%H:%M:%S+00:00" set xdata time diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-installation-4.4.0/package/yast2-installation.changes new/yast2-installation-4.4.4/package/yast2-installation.changes --- old/yast2-installation-4.4.0/package/yast2-installation.changes 2021-04-07 17:13:07.000000000 +0200 +++ new/yast2-installation-4.4.4/package/yast2-installation.changes 2021-04-16 12:34:20.000000000 +0200 @@ -1,4 +1,54 @@ ------------------------------------------------------------------- +Fri Apr 16 10:19:04 UTC 2021 - Dirk M??ller <dmuel...@suse.com> + +- spec-cleaner part five out of five: sort and deduplicate requires +- 4.4.4 + +------------------------------------------------------------------- +Fri Apr 16 09:50:49 UTC 2021 - Dirk M??ller <dmuel...@suse.com> + +- spec-cleaner part two out of five: move conditionalized sections at the end +- spec-cleaner part three out of five: move weak requires (recommends) below requires +- spec-cleaner part four out of five: sort and deduplicate BuildRequires + +------------------------------------------------------------------- +Fri Apr 16 08:39:17 UTC 2021 - Dirk M??ller <dmuel...@suse.com> + +- remove check for non-systemd distros +- first out of 5 splits of "spec-cleaner -m -i *ec" run (for easier review) + +------------------------------------------------------------------- +Wed Apr 14 11:08:52 UTC 2021 - Knut Anderssen <kanders...@suse.com> + +- Show 'Default' in the proposal summary as the PolicyKit Default + Privileges to be used when it is not specified or specified as + empty in the control file (bsc#1184277) +- 4.4.3 + +------------------------------------------------------------------- +Wed Apr 14 09:46:38 UTC 2021 - Ludwig Nussel <lnus...@suse.com> + +- Check for usr/lib/modules to handle usrmerge (bsc#1029961) +- 4.4.2 + +------------------------------------------------------------------- +Wed Apr 14 08:44:31 UTC 2021 - Dominique Leuenberger <dims...@opensuse.org> + +- Do not own system directories (like /usr/bin) (bsc#1184787): + + filesystem is responsible to bring those directories with the + correct permission flags. Owning them here only introduces + races/conflicts. + + As a result: expand the files section for bindir and unitdir to + be exact on the files. + +------------------------------------------------------------------- +Fri Apr 9 16:21:31 UTC 2021 - Ladislav Slez??k <lsle...@suse.cz> + +- Start the "memsample" tool in a subshell to avoid "Terminated" + message displayed at the end (bsc#1184491) +- 4.4.1 + +------------------------------------------------------------------- Wed Apr 7 10:54:58 UTC 2021 - David Diaz <dgonza...@suse.com> - Hide the abort button when the network client is called diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-installation-4.4.0/package/yast2-installation.spec new/yast2-installation-4.4.4/package/yast2-installation.spec --- old/yast2-installation-4.4.0/package/yast2-installation.spec 2021-04-07 17:13:07.000000000 +0200 +++ new/yast2-installation-4.4.4/package/yast2-installation.spec 2021-04-16 12:34:20.000000000 +0200 @@ -1,7 +1,7 @@ # # spec file for package yast2-installation # -# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2021 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -15,124 +15,116 @@ # Please submit bugfixes or comments via https://bugs.opensuse.org/ # + Name: yast2-installation -Version: 4.4.0 +Version: 4.4.4 Release: 0 -Group: System/YaST -License: GPL-2.0-only Summary: YaST2 - Installation Parts -Url: https://github.com/yast/yast-installation - +License: GPL-2.0-only +Group: System/YaST +URL: https://github.com/yast/yast-installation Source0: %{name}-%{version}.tar.bz2 Source1: YaST2-Second-Stage.service Source2: YaST2-Firstboot.service BuildRequires: update-desktop-files -BuildRequires: yast2-devtools >= 3.1.10 -# for AbortException and handle direct abort -BuildRequires: yast2-ruby-bindings >= 4.0.6 -# needed for xml agent reading about products -BuildRequires: yast2-xml -BuildRequires: rubygem(%{rb_default_ruby_abi}:rspec) -BuildRequires: rubygem(%{rb_default_ruby_abi}:yast-rake) # Yast2::FsSnapshotStore::IOError BuildRequires: yast2 >= 4.3.53 -# Y2Packager::MediumType -BuildRequires: yast2-packager >= 4.2.27 # CIOIgnore BuildRequires: yast2-bootloader -# For selinux classes -BuildRequires: yast2-security +# storage-ng based version +BuildRequires: yast2-country >= 3.3.1 +BuildRequires: yast2-devtools >= 3.1.10 # For firewall widgets BuildRequires: yast2-firewall -# using /usr/bin/udevadm -BuildRequires: yast2-storage-ng >= 4.2.71 # Y2Network::NtpServer BuildRequires: yast2-network >= 4.2.55 +# Y2Packager::MediumType +BuildRequires: yast2-packager >= 4.2.27 +# for AbortException and handle direct abort +BuildRequires: yast2-ruby-bindings >= 4.0.6 +# For selinux classes +BuildRequires: yast2-security +# using /usr/bin/udevadm +BuildRequires: yast2-storage-ng >= 4.2.71 # new root password cwm widget BuildRequires: yast2-users >= 3.2.8 -# storage-ng based version -BuildRequires: yast2-country >= 3.3.1 -BuildRequires: yast2-bootloader - -PreReq: %fillup_prereq -Requires: yast2-users >= 3.2.8 -Requires: yast2-country >= 3.3.1 -# tar-gzip some system files and untar-ungzip them after the installation (FATE #300421, #120103) -Requires: tar -Requires: gzip -Requires: coreutils +# needed for xml agent reading about products +BuildRequires: yast2-xml +BuildRequires: rubygem(%{rb_default_ruby_abi}:rspec) +BuildRequires: rubygem(%{rb_default_ruby_abi}:yast-rake) # Augeas lenses Requires: augeas-lenses -# Only in inst-sys -Requires: yast2-storage-ng >= 4.0.175 +Requires: coreutils +Requires: gzip +# use in startup scripts +Requires: initviocons +# Needed call /sbin/ip in vnc.sh/network.sh +Requires: iproute2 +# for the first/second stage of installation +# currently not used +# bugzilla #208307 +#Requires: /usr/bin/jpegtopnm +#Requires: /usr/bin/pnmtopng +# BNC 446533, /sbin/lspci called but not installed +Requires: pciutils +# tar-gzip some system files and untar-ungzip them after the installation (FATE #300421, #120103) +Requires: tar +# Yast2::FsSnapshotStore::IOError +Requires: yast2 >= 4.3.53 +# CIOIgnore +Requires: yast2-bootloader +Requires: yast2-country >= 3.3.1 # Language::GetLanguageItems and other API # Language::Set (handles downloading the translation extensions) Requires: yast2-country-data >= 2.16.11 -# Pkg::ProvidePackage -Requires: yast2-pkg-bindings >= 3.1.33 +# Y2Network::NtpServer +Requires: yast2-network >= 4.2.55 # Y2Packager::MediumType Requires: yast2-packager >= 4.2.22 -# CIOIgnore -Requires: yast2-bootloader -# use in startup scripts -Requires: initviocons +# Pkg::ProvidePackage +Requires: yast2-pkg-bindings >= 3.1.33 # Proxy settings for 2nd stage (bnc#764951) Requires: yast2-proxy +# for AbortException and handle direct abort +Requires: yast2-ruby-bindings >= 4.0.6 # Systemd default target and services. This version supports # writing settings in the first installation stage. Requires: yast2-services-manager >= 3.2.1 -# Yast2::FsSnapshotStore::IOError -Requires: yast2 >= 4.3.53 -# Y2Network::NtpServer -Requires: yast2-network >= 4.2.55 -# for AbortException and handle direct abort -Requires: yast2-ruby-bindings >= 4.0.6 -# for the first/second stage of installation -# currently not used -# bugzilla #208307 -#Requires: /usr/bin/jpegtopnm -#Requires: /usr/bin/pnmtopng -# BNC 446533, /sbin/lspci called but not installed -Requires: pciutils -# Needed call /sbin/ip in vnc.sh/network.sh -Requires: iproute2 -%if 0%{?suse_version} >= 1210 -%{systemd_requires} -%endif - - +# Only in inst-sys +Requires: yast2-storage-ng >= 4.0.175 +Requires: yast2-users >= 3.2.8 +PreReq: %fillup_prereq +Recommends: yast2-add-on +Recommends: yast2-firewall +Recommends: yast2-online-update +Supplements: autoyast(deploy_image:ssh_import) +# new autoinst_files_finish call +Conflicts: autoyast2 < 4.3.26 # SingleItemSelector not enforcing an initial selection Conflicts: libyui < 3.8.2 -# Pkg::SourceProvideSignedFile Pkg::SourceProvideDigestedFile -# pkg-bindings are not directly required -Conflicts: yast2-pkg-bindings < 2.17.25 # InstError Conflicts: yast2 < 2.18.6 # storage-ng based version Conflicts: yast2-bootloader < 3.3.1 # Added new function WFM::ClientExists Conflicts: yast2-core < 2.17.10 -# Top bar with logo -Conflicts: yast2-ycp-ui-bindings < 3.1.7 -# Registration#get_updates_list does not handle exceptions -Conflicts: yast2-registration < 3.2.3 # Mouse-related scripts moved to yast2-mouse Conflicts: yast2-mouse < 2.18.0 -# new autoinst_files_finish call -Conflicts: autoyast2 < 4.3.26 +# Pkg::SourceProvideSignedFile Pkg::SourceProvideDigestedFile +# pkg-bindings are not directly required +Conflicts: yast2-pkg-bindings < 2.17.25 +# Registration#get_updates_list does not handle exceptions +Conflicts: yast2-registration < 3.2.3 # moved security_finish client Conflicts: yast2-security < 4.3.11 - +# Top bar with logo +Conflicts: yast2-ycp-ui-bindings < 3.1.7 Obsoletes: yast2-installation-devel-doc - -Recommends: yast2-online-update -Recommends: yast2-firewall -Recommends: yast2-add-on - -Supplements: autoyast(deploy_image:ssh_import) - BuildArch: noarch +%if 0%{?suse_version} >= 1210 +%{systemd_requires} +%endif %description System installation code as present on installation media. @@ -171,8 +163,6 @@ %post %{fillup_only -ns security checksig} -%if 0%{suse_version} > 1140 - %service_add_post YaST2-Second-Stage.service YaST2-Firstboot.service # bsc#924278 Always enable these services by default, they are already listed @@ -193,15 +183,15 @@ %postun %service_del_postun YaST2-Second-Stage.service YaST2-Firstboot.service -#suse_version -%endif - %files - # systemd service files -%{_unitdir} +%{_unitdir}/YaST2-Firstboot.service +%{_unitdir}/YaST2-Second-Stage.service +%{_bindir}/memsample +%{_bindir}/memsample-archive-to-csv +%{_bindir}/memsample-csv-plot # yupdate script -%{_bindir}/ +%{_bindir}/yupdate %{yast_clientdir} %{yast_moduledir} %{yast_desktopdir} diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-installation-4.4.0/src/lib/installation/clients/security_proposal.rb new/yast2-installation-4.4.4/src/lib/installation/clients/security_proposal.rb --- old/yast2-installation-4.4.0/src/lib/installation/clients/security_proposal.rb 2021-04-07 17:13:07.000000000 +0200 +++ new/yast2-installation-4.4.4/src/lib/installation/clients/security_proposal.rb 2021-04-16 12:34:20.000000000 +0200 @@ -232,7 +232,7 @@ end def polkit_default_priv_proposal - value = @settings.polkit_default_privileges || "default" + value = @settings.polkit_default_privileges.to_s human_value = @settings.human_polkit_privileges[value] format(_("PolicyKit Default Privileges: %s"), human_value) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-installation-4.4.0/src/lib/installation/instsys_cleaner.rb new/yast2-installation-4.4.4/src/lib/installation/instsys_cleaner.rb --- old/yast2-installation-4.4.0/src/lib/installation/instsys_cleaner.rb 2021-04-07 17:13:07.000000000 +0200 +++ new/yast2-installation-4.4.4/src/lib/installation/instsys_cleaner.rb 2021-04-16 12:34:20.000000000 +0200 @@ -61,7 +61,7 @@ # kernel modules can vary significantly. This saves about 29MB on x86_64 # and about 5MB on s390x. def self.unmount_kernel_modules - if !File.exist?(File.join(KERNEL_MODULES_MOUNT_POINT, "lib/modules")) + if !File.exist?(File.join(KERNEL_MODULES_MOUNT_POINT, "lib/modules")) && !File.exist?(File.join(KERNEL_MODULES_MOUNT_POINT, "usr/lib/modules")) log.warn("Kernel modules not found at #{KERNEL_MODULES_MOUNT_POINT}") log.warn("Skipping module cleanup") return diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-installation-4.4.0/src/lib/installation/security_settings.rb new/yast2-installation-4.4.4/src/lib/installation/security_settings.rb --- old/yast2-installation-4.4.0/src/lib/installation/security_settings.rb 2021-04-07 17:13:07.000000000 +0200 +++ new/yast2-installation-4.4.4/src/lib/installation/security_settings.rb 2021-04-16 12:34:20.000000000 +0200 @@ -146,7 +146,7 @@ def human_polkit_privileges { - "default" => _("Default"), + "" => _("Default"), # TRANSLATORS: restrictive in sense the most restrictive policy "restrictive" => _("Restrictive"), "standard" => _("Standard"), diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-installation-4.4.0/src/lib/installation/widgets/polkit_default_priv.rb new/yast2-installation-4.4.4/src/lib/installation/widgets/polkit_default_priv.rb --- old/yast2-installation-4.4.0/src/lib/installation/widgets/polkit_default_priv.rb 2021-04-07 17:13:07.000000000 +0200 +++ new/yast2-installation-4.4.4/src/lib/installation/widgets/polkit_default_priv.rb 2021-04-16 12:34:20.000000000 +0200 @@ -18,6 +18,7 @@ # ------------------------------------------------------------------------------ require "cwm/common_widgets" +require "installation/security_settings" module Installation module Widgets @@ -53,18 +54,17 @@ "to allow a more seamless user experience without" \ " interruptions in the workflow due to password " \ "prompts.</li></ul><br>" \ - "The \"default\" is to keep value empty and it will be" \ + "The \"default\" is to keep value empty and it will be " \ "assigned automatically.</p>" ) end def init - self.value = @settings.polkit_default_privileges || "default" + self.value = @settings.polkit_default_privileges.to_s end def store - res = value == "default" ? nil : value - @settings.polkit_default_privileges = res + @settings.polkit_default_privileges = value.empty? ? nil : value end end end diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-installation-4.4.0/startup/First-Stage/F08-logging new/yast2-installation-4.4.4/startup/First-Stage/F08-logging --- old/yast2-installation-4.4.0/startup/First-Stage/F08-logging 2021-04-07 17:13:07.000000000 +0200 +++ new/yast2-installation-4.4.4/startup/First-Stage/F08-logging 2021-04-16 12:34:20.000000000 +0200 @@ -65,7 +65,10 @@ if pgrep -f memsample; then log "\talready running" else - memsample --sleep="${MEMSAMPLE-5}" --archive=/var/log/YaST2/memsample.zcat & - log "\tPID: $!" + # use a subshell to avoid "Terminated" message when killing the process at the end + ( + memsample --sleep="${MEMSAMPLE-5}" --archive=/var/log/YaST2/memsample.zcat & + log "\tPID: $!" + ) fi fi diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-installation-4.4.0/test/lib/clients/security_proposal_test.rb new/yast2-installation-4.4.4/test/lib/clients/security_proposal_test.rb --- old/yast2-installation-4.4.0/test/lib/clients/security_proposal_test.rb 2021-04-07 17:13:07.000000000 +0200 +++ new/yast2-installation-4.4.4/test/lib/clients/security_proposal_test.rb 2021-04-16 12:34:20.000000000 +0200 @@ -184,5 +184,39 @@ end end end + + context "when showing the PolicyKit Default privileges selected" do + let(:selected) { "" } + + before do + allow(proposal_settings).to receive(:polkit_default_privileges).and_return(selected) + end + + context "and it is not set" do + let(:selected) { nil } + + it "shows it as 'Default'" do + proposal = client.make_proposal({}) + expect(proposal["preformatted_proposal"]).to include("Privileges: Default") + end + end + + context "and it is empty" do + let(:selected) { nil } + + it "shows it as 'Default'" do + proposal = client.make_proposal({}) + expect(proposal["preformatted_proposal"]).to include("Privileges: Default") + end + end + context "and it is restrictive" do + let(:selected) { "restrictive" } + + it "shows it as 'Restrictive'" do + proposal = client.make_proposal({}) + expect(proposal["preformatted_proposal"]).to include("Privileges: Restrictive") + end + end + end end end diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-installation-4.4.0/test/lib/widgets/polkit_default_priv_test.rb new/yast2-installation-4.4.4/test/lib/widgets/polkit_default_priv_test.rb --- old/yast2-installation-4.4.0/test/lib/widgets/polkit_default_priv_test.rb 2021-04-07 17:13:07.000000000 +0200 +++ new/yast2-installation-4.4.4/test/lib/widgets/polkit_default_priv_test.rb 2021-04-16 12:34:20.000000000 +0200 @@ -5,7 +5,32 @@ require "cwm/rspec" describe Installation::Widgets::PolkitDefaultPriv do - subject { described_class.new(Installation::SecuritySettings.create_instance) } + let(:settings) { Installation::SecuritySettings.create_instance } + subject { described_class.new(settings) } include_examples "CWM::ComboBox" + + describe ".store" do + let(:selected) { "" } + + before do + allow(subject).to receive(:value).and_return(selected) + end + + context "when the value selected is the 'Default'" do + it "sets the settings polkit_default_privileges to nil" do + expect(settings).to receive(:polkit_default_privileges=).with(nil) + subject.store + end + end + + context "when the value selected is other" do + let(:selected) { "restrictive" } + + it "sets the settings with the selected value" do + expect(settings).to receive(:polkit_default_privileges=).with("restrictive") + subject.store + end + end + end end
