Hello community,
here is the log from the commit of package autoyast2 for openSUSE:Factory checked in at 2019-07-31 14:25:21
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/autoyast2 (Old)
and /work/SRC/openSUSE:Factory/.autoyast2.new.4126 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "autoyast2"
Wed Jul 31 14:25:21 2019 rev:259 rq:718460 version:4.2.5
Changes:
--------
--- /work/SRC/openSUSE:Factory/autoyast2/autoyast2.changes 2019-05-05 21:17:14.140593354 +0200
+++ /work/SRC/openSUSE:Factory/.autoyast2.new.4126/autoyast2.changes 2019-07-31 14:25:22.742313705 +0200
@@ -1,0 +2,41 @@
+Thu Jul 18 15:05:10 UTC 2019 - Jan Engelhardt
+
+- Use modern tar syntax
+- Require fillup because it's executed in %post
+
+-------------------------------------------------------------------
+Thu Jul 18 14:49:00 UTC 2019 - Martin Vidner
+
+- Fixed an Internal Error when AutoYaST is importing users and
+ groups configuration (bsc#1140339).
+- 4.2.5
+
+-------------------------------------------------------------------
+Wed Jul 3 09:55:40 CEST 2019 - schubi@suse.de
+
+- Fixed new desktop file name (bsc#1138144).
+- 4.2.4
+
+-------------------------------------------------------------------
+Mon Jun 17 13:33:11 UTC 2019 - José Iván López González
+
+- Always perform a storage re-probe after executing pre-scripts.
+- Related to bsc#1133045
+- 4.2.3
+
+-------------------------------------------------------------------
+Mon Jun 10 14:11:02 UTC 2019 - José Iván López González
+
+- Add multi-device Btrfs related elements to the partitioning
+ schema (part of jsc#SLE-3877).
+- 4.2.2
+
+-------------------------------------------------------------------
+Fri May 31 12:26:24 UTC 2019 - Stasiek Michalski
+
+- Add metainfo (fate#319035)
+- Revamp spec
+- Replace GenericName with Comment
+- 4.2.1
+
+-------------------------------------------------------------------
Old:
----
autoyast2-4.2.0.tar.bz2
New:
----
autoyast2-4.2.5.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ autoyast2.spec ++++++
--- /var/tmp/diff_new_pack.DTrTos/_old 2019-07-31 14:25:23.190313401 +0200
+++ /var/tmp/diff_new_pack.DTrTos/_new 2019-07-31 14:25:23.194313399 +0200
@@ -18,19 +18,22 @@
#Compat macro for new _fillupdir macro introduced in Nov 2017
%if ! %{defined _fillupdir}
- %define _fillupdir /var/adm/fillup-templates
+ %define _fillupdir %{_localstatedir}/adm/fillup-templates
%endif
Name: autoyast2
-Version: 4.2.0
+Version: 4.2.5
Release: 0
+Summary: YaST2 - Automated Installation
+License: GPL-2.0-only
+Group: System/YaST
+Url: https://github.com/yast/yast-autoinstallation
-BuildRoot: %{_tmppath}/%{name}-%{version}-build
Source0: autoyast2-%{version}.tar.bz2
-
Source1: autoyast_en_html.tar.bz2
+
BuildRequires: update-desktop-files
-BuildRequires: yast2-devtools >= 3.1.15
+BuildRequires: yast2-devtools >= 4.2.2
# control.rng
BuildRequires: yast2-installation-control
# xmllint
@@ -50,7 +53,6 @@
BuildRequires: yast2-xml
# AutoinstIssues::NoProposal
BuildRequires: yast2-storage-ng >= 4.0.160
-
# %%{_unitdir} macro definition is in a separate package since 13.1
%if 0%{?suse_version} >= 1310
BuildRequires: systemd-rpm-macros
@@ -72,23 +74,22 @@
Requires: yast2-transfer >= 2.21.0
Requires: yast2-xml
# AutoinstIssues::NoProposal
+Requires: yast2-ruby-bindings >= 1.0.0
Requires: yast2-storage-ng >= 4.0.160
+
Conflicts: yast2-installation < 3.1.166
Provides: yast2-config-autoinst
+Provides: yast2-lib-autoinst
Provides: yast2-module-autoinst
+
Obsoletes: yast2-config-autoinst
-Obsoletes: yast2-module-autoinst
-Provides: yast2-lib-autoinst
Obsoletes: yast2-lib-autoinst
+Obsoletes: yast2-module-autoinst
BuildArch: noarch
-Requires: yast2-ruby-bindings >= 1.0.0
-
-Summary: YaST2 - Automated Installation
-License: GPL-2.0-only
-Group: System/YaST
+Requires(post): %fillup_prereq
%description
This package is intended for management of the control files and the
@@ -101,11 +102,13 @@
installation sources.
%package installation
-Requires: yast2-ruby-bindings >= 1.0.0
-
Summary: YaST2 - Auto Installation Modules
-# API for Disabled Modules (ProductControl)
Group: System/YaST
+
+# Y2Storage::AutoinstIssues containing section information
+BuildRequires: yast2-storage-ng >= 4.0.15
+
+# API for Disabled Modules (ProductControl)
Requires: yast2 >= 2.16.36
# After API cleanup
Requires: yast2
@@ -124,8 +127,8 @@
Requires: yast2-xml
# "transact_by" key in PkgPropertiesAll()
Requires: yast2-pkg-bindings >= 4.0.7
-# Y2Storage::AutoinstIssues containing section information
-BuildRequires: yast2-storage-ng >= 4.0.15
+Requires: yast2-ruby-bindings >= 1.0.0
+
Provides: yast2-trans-autoinst
Obsoletes: yast2-trans-autoinst
@@ -134,65 +137,64 @@
generated with the autoyast2 package.
%prep
-%setup -n autoyast2-%{version}
+%setup -q
%build
%yast_build
%install
%yast_install
+%yast_metainfo
# Do not *blindly* remove the suse_update_desktop_file calls here. It is
# different from the code in the yast_install macro.
-for d in $RPM_BUILD_ROOT/usr/share/autoinstall/modules/*.desktop ; do
+for d in %{buildroot}%{_datadir}/autoinstall/modules/*.desktop ; do
%suse_update_desktop_file $d
done
# Class conf
-install -d -m 700 $RPM_BUILD_ROOT/etc/autoinstall
+install -d -m 700 %{buildroot}%{_sysconfdir}/autoinstall
# Installation files
-install -d -m 700 $RPM_BUILD_ROOT/var/adm/autoinstall/scripts
-install -d -m 700 $RPM_BUILD_ROOT/var/adm/autoinstall/init.d
-install -d -m 700 $RPM_BUILD_ROOT/var/adm/autoinstall/logs
-install -d -m 700 $RPM_BUILD_ROOT/var/adm/autoinstall/files
-install -d -m 700 $RPM_BUILD_ROOT/var/adm/autoinstall/cache
+install -d -m 700 %{buildroot}%{_localstatedir}/adm/autoinstall/scripts
+install -d -m 700 %{buildroot}%{_localstatedir}/adm/autoinstall/init.d
+install -d -m 700 %{buildroot}%{_localstatedir}/adm/autoinstall/logs
+install -d -m 700 %{buildroot}%{_localstatedir}/adm/autoinstall/files
+install -d -m 700 %{buildroot}%{_localstatedir}/adm/autoinstall/cache
# Repository
-install -d $RPM_BUILD_ROOT/var/lib/autoinstall/repository
-install -d $RPM_BUILD_ROOT/var/lib/autoinstall/repository/templates
-install -d $RPM_BUILD_ROOT/var/lib/autoinstall/repository/rules
-install -d $RPM_BUILD_ROOT/var/lib/autoinstall/repository/classes
-install -d $RPM_BUILD_ROOT/var/lib/autoinstall/autoconf
-install -d $RPM_BUILD_ROOT/var/lib/autoinstall/tmp
+install -d %{buildroot}%{_localstatedir}/lib/autoinstall/repository
+install -d %{buildroot}%{_localstatedir}/lib/autoinstall/repository/templates
+install -d %{buildroot}%{_localstatedir}/lib/autoinstall/repository/rules
+install -d %{buildroot}%{_localstatedir}/lib/autoinstall/repository/classes
+install -d %{buildroot}%{_localstatedir}/lib/autoinstall/autoconf
+install -d %{buildroot}%{_localstatedir}/lib/autoinstall/tmp
# Systemd Stuff
-mkdir -p $RPM_BUILD_ROOT/%{_unitdir}/
-install -m 644 scripts/autoyast-initscripts.service $RPM_BUILD_ROOT/%{_unitdir}/
+mkdir -p %{buildroot}%{_unitdir}/
+install -m 644 scripts/autoyast-initscripts.service %{buildroot}%{_unitdir}/
# Documentation
-install -d -m 755 $RPM_BUILD_ROOT/%{_prefix}/share/doc/packages/autoyast2/html
-tar xvpfC %{SOURCE1} $RPM_BUILD_ROOT/%{_prefix}/share/doc/packages/autoyast2/html
-mv $RPM_BUILD_ROOT/%{_prefix}/share/doc/packages/autoyast2/html/autoyast/* $RPM_BUILD_ROOT/%{_prefix}/share/doc/packages/autoyast2/html/
-rmdir $RPM_BUILD_ROOT/%{_prefix}/share/doc/packages/autoyast2/html/autoyast
+install -d -m 755 %{buildroot}%{yast_docdir}/html
+tar -xvpf %{SOURCE1} -C %{buildroot}%{yast_docdir}/html
+mv %{buildroot}%{yast_docdir}/html/autoyast/* %{buildroot}%{yast_docdir}/html/
+rmdir %{buildroot}%{yast_docdir}/html/autoyast
%post
%{fillup_only -n autoinstall}
%files
-%defattr(-,root,root)
-%dir /etc/autoinstall
+%dir %{_sysconfdir}/autoinstall
%dir %{yast_yncludedir}/autoinstall
-%dir /var/lib/autoinstall/repository
-%dir /var/lib/autoinstall/repository/templates
-%dir /var/lib/autoinstall/repository/rules
-%dir /var/lib/autoinstall/repository/classes
-%dir /var/lib/autoinstall/tmp
-%doc %{_prefix}/share/doc/packages/autoyast2
-
-%dir %yast_desktopdir
-%{yast_desktopdir}/autoyast.desktop
-%{yast_desktopdir}/clone_system.desktop
-/usr/share/autoinstall/modules/*.desktop
+%dir %{_localstatedir}/lib/autoinstall/repository
+%dir %{_localstatedir}/lib/autoinstall/repository/templates
+%dir %{_localstatedir}/lib/autoinstall/repository/rules
+%dir %{_localstatedir}/lib/autoinstall/repository/classes
+%dir %{_localstatedir}/lib/autoinstall/tmp
+%doc %{yast_docdir}
+
+%{yast_desktopdir}
+%{yast_metainfodir}
+%{_datadir}/autoinstall/modules/*.desktop
%dir %{yast_yncludedir}
%{yast_yncludedir}/autoinstall/classes.rb
%{yast_yncludedir}/autoinstall/conftree.rb
@@ -226,21 +228,20 @@
%{_fillupdir}/sysconfig.autoinstall
%files installation
-%defattr(-,root,root)
%dir %{yast_scrconfdir}
%{yast_scrconfdir}/autoinstall.scr
%{yast_scrconfdir}/cfg_autoinstall.scr
# DTD files
-%dir /usr/share/autoinstall
-#%dir /usr/share/autoinstall/dtd
-%dir /usr/share/autoinstall/modules
-#/usr/share/autoinstall/dtd/*
+%dir %{_datadir}/autoinstall
+#%dir %{_datadir}/autoinstall/dtd
+%dir %{_datadir}/autoinstall/modules
+#%{_datadir}/autoinstall/dtd/*
# systemd service file
%{_unitdir}/autoyast-initscripts.service
-%dir /usr/share/autoinstall/xslt
-/usr/share/autoinstall/xslt/merge.xslt
+%dir %{_datadir}/autoinstall/xslt
+%{_datadir}/autoinstall/xslt/merge.xslt
# config file
%dir %{yast_moduledir}
@@ -310,18 +311,18 @@
%{yast_libdir}/autoinstall/autoinst_issues/*.rb
# scripts
-%{_prefix}/lib/YaST2/bin/fetch_image.sh
-%{_prefix}/lib/YaST2/bin/autoyast-initscripts.sh
+%{yast_ybindir}/fetch_image.sh
+%{yast_ybindir}/autoyast-initscripts.sh
%license COPYING
-%dir /var/adm/autoinstall/
-%dir /var/adm/autoinstall/scripts
-%dir /var/adm/autoinstall/init.d
-%dir /var/adm/autoinstall/logs
-%dir /var/adm/autoinstall/files
-%dir /var/adm/autoinstall/cache
-%dir /var/lib/autoinstall
-%dir /var/lib/autoinstall/autoconf
+%dir %{_localstatedir}/adm/autoinstall/
+%dir %{_localstatedir}/adm/autoinstall/scripts
+%dir %{_localstatedir}/adm/autoinstall/init.d
+%dir %{_localstatedir}/adm/autoinstall/logs
+%dir %{_localstatedir}/adm/autoinstall/files
+%dir %{_localstatedir}/adm/autoinstall/cache
+%dir %{_localstatedir}/lib/autoinstall
+%dir %{_localstatedir}/lib/autoinstall/autoconf
%changelog
++++++ autoyast2-4.2.0.tar.bz2 -> autoyast2-4.2.5.tar.bz2 ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/autoyast2-4.2.0/package/autoyast2.changes new/autoyast2-4.2.5/package/autoyast2.changes
--- old/autoyast2-4.2.0/package/autoyast2.changes 2019-04-30 15:34:18.000000000 +0200
+++ new/autoyast2-4.2.5/package/autoyast2.changes 2019-07-25 09:54:59.000000000 +0200
@@ -1,4 +1,45 @@
-------------------------------------------------------------------
+Thu Jul 18 15:05:10 UTC 2019 - Jan Engelhardt
+
+- Use modern tar syntax
+- Require fillup because it's executed in %post
+
+-------------------------------------------------------------------
+Thu Jul 18 14:49:00 UTC 2019 - Martin Vidner
+
+- Fixed an Internal Error when AutoYaST is importing users and
+ groups configuration (bsc#1140339).
+- 4.2.5
+
+-------------------------------------------------------------------
+Wed Jul 3 09:55:40 CEST 2019 - schubi@suse.de
+
+- Fixed new desktop file name (bsc#1138144).
+- 4.2.4
+
+-------------------------------------------------------------------
+Mon Jun 17 13:33:11 UTC 2019 - José Iván López González
+
+- Always perform a storage re-probe after executing pre-scripts.
+- Related to bsc#1133045
+- 4.2.3
+
+-------------------------------------------------------------------
+Mon Jun 10 14:11:02 UTC 2019 - José Iván López González
+
+- Add multi-device Btrfs related elements to the partitioning
+ schema (part of jsc#SLE-3877).
+- 4.2.2
+
+-------------------------------------------------------------------
+Fri May 31 12:26:24 UTC 2019 - Stasiek Michalski
+
+- Add metainfo (fate#319035)
+- Revamp spec
+- Replace GenericName with Comment
+- 4.2.1
+
+-------------------------------------------------------------------
Mon Apr 29 11:34:37 UTC 2019 - Ladislav Slezák
- Uninstall the "SUSE-Manager-Proxy" product when upgrading from
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/autoyast2-4.2.0/package/autoyast2.spec new/autoyast2-4.2.5/package/autoyast2.spec
--- old/autoyast2-4.2.0/package/autoyast2.spec 2019-04-30 15:34:18.000000000 +0200
+++ new/autoyast2-4.2.5/package/autoyast2.spec 2019-07-25 09:54:59.000000000 +0200
@@ -12,25 +12,28 @@
# license that conforms to the Open Source Definition (Version 1.9)
# published by the Open Source Initiative.
-# Please submit bugfixes or comments via http://bugs.opensuse.org/
+# Please submit bugfixes or comments via https://bugs.opensuse.org/
#
#Compat macro for new _fillupdir macro introduced in Nov 2017
%if ! %{defined _fillupdir}
- %define _fillupdir /var/adm/fillup-templates
+ %define _fillupdir %{_localstatedir}/adm/fillup-templates
%endif
Name: autoyast2
-Version: 4.2.0
+Version: 4.2.5
Release: 0
+Summary: YaST2 - Automated Installation
+License: GPL-2.0-only
+Group: System/YaST
+Url: https://github.com/yast/yast-autoinstallation
-BuildRoot: %{_tmppath}/%{name}-%{version}-build
Source0: autoyast2-%{version}.tar.bz2
-
Source1: autoyast_en_html.tar.bz2
+
BuildRequires: update-desktop-files
-BuildRequires: yast2-devtools >= 3.1.15
+BuildRequires: yast2-devtools >= 4.2.2
# control.rng
BuildRequires: yast2-installation-control
# xmllint
@@ -50,7 +53,6 @@
BuildRequires: yast2-country
# AutoinstIssues::NoProposal
BuildRequires: yast2-storage-ng >= 4.0.160
-
# %%{_unitdir} macro definition is in a separate package since 13.1
%if 0%{?suse_version} >= 1310
BuildRequires: systemd-rpm-macros
@@ -73,22 +75,21 @@
Requires: yast2-xml
# AutoinstIssues::NoProposal
Requires: yast2-storage-ng >= 4.0.160
+Requires: yast2-ruby-bindings >= 1.0.0
+
Conflicts: yast2-installation < 3.1.166
Provides: yast2-config-autoinst
Provides: yast2-module-autoinst
+Provides: yast2-lib-autoinst
+
Obsoletes: yast2-config-autoinst
Obsoletes: yast2-module-autoinst
-Provides: yast2-lib-autoinst
Obsoletes: yast2-lib-autoinst
BuildArch: noarch
-Requires: yast2-ruby-bindings >= 1.0.0
-
-Summary: YaST2 - Automated Installation
-License: GPL-2.0-only
-Group: System/YaST
+Requires(post): %fillup_prereq
%description
This package is intended for management of the control files and the
@@ -101,10 +102,12 @@
installation sources.
%package installation
-Requires: yast2-ruby-bindings >= 1.0.0
-
Summary: YaST2 - Auto Installation Modules
Group: System/YaST
+
+# Y2Storage::AutoinstIssues containing section information
+BuildRequires: yast2-storage-ng >= 4.0.15
+
# API for Disabled Modules (ProductControl)
Requires: yast2 >= 2.16.36
# After API cleanup
@@ -124,8 +127,8 @@
Requires: yast2-xml
# "transact_by" key in PkgPropertiesAll()
Requires: yast2-pkg-bindings >= 4.0.7
-# Y2Storage::AutoinstIssues containing section information
-BuildRequires: yast2-storage-ng >= 4.0.15
+Requires: yast2-ruby-bindings >= 1.0.0
+
Provides: yast2-trans-autoinst
Obsoletes: yast2-trans-autoinst
@@ -134,65 +137,64 @@
generated with the autoyast2 package.
%prep
-%setup -n autoyast2-%{version}
+%setup -q
%build
%yast_build
%install
%yast_install
+%yast_metainfo
# Do not *blindly* remove the suse_update_desktop_file calls here. It is
# different from the code in the yast_install macro.
-for d in $RPM_BUILD_ROOT/usr/share/autoinstall/modules/*.desktop ; do
+for d in %{buildroot}%{_datadir}/autoinstall/modules/*.desktop ; do
%suse_update_desktop_file $d
done
# Class conf
-install -d -m 700 $RPM_BUILD_ROOT/etc/autoinstall
+install -d -m 700 %{buildroot}%{_sysconfdir}/autoinstall
# Installation files
-install -d -m 700 $RPM_BUILD_ROOT/var/adm/autoinstall/scripts
-install -d -m 700 $RPM_BUILD_ROOT/var/adm/autoinstall/init.d
-install -d -m 700 $RPM_BUILD_ROOT/var/adm/autoinstall/logs
-install -d -m 700 $RPM_BUILD_ROOT/var/adm/autoinstall/files
-install -d -m 700 $RPM_BUILD_ROOT/var/adm/autoinstall/cache
+install -d -m 700 %{buildroot}%{_localstatedir}/adm/autoinstall/scripts
+install -d -m 700 %{buildroot}%{_localstatedir}/adm/autoinstall/init.d
+install -d -m 700 %{buildroot}%{_localstatedir}/adm/autoinstall/logs
+install -d -m 700 %{buildroot}%{_localstatedir}/adm/autoinstall/files
+install -d -m 700 %{buildroot}%{_localstatedir}/adm/autoinstall/cache
# Repository
-install -d $RPM_BUILD_ROOT/var/lib/autoinstall/repository
-install -d $RPM_BUILD_ROOT/var/lib/autoinstall/repository/templates
-install -d $RPM_BUILD_ROOT/var/lib/autoinstall/repository/rules
-install -d $RPM_BUILD_ROOT/var/lib/autoinstall/repository/classes
-install -d $RPM_BUILD_ROOT/var/lib/autoinstall/autoconf
-install -d $RPM_BUILD_ROOT/var/lib/autoinstall/tmp
+install -d %{buildroot}%{_localstatedir}/lib/autoinstall/repository
+install -d %{buildroot}%{_localstatedir}/lib/autoinstall/repository/templates
+install -d %{buildroot}%{_localstatedir}/lib/autoinstall/repository/rules
+install -d %{buildroot}%{_localstatedir}/lib/autoinstall/repository/classes
+install -d %{buildroot}%{_localstatedir}/lib/autoinstall/autoconf
+install -d %{buildroot}%{_localstatedir}/lib/autoinstall/tmp
# Systemd Stuff
-mkdir -p $RPM_BUILD_ROOT/%{_unitdir}/
-install -m 644 scripts/autoyast-initscripts.service $RPM_BUILD_ROOT/%{_unitdir}/
+mkdir -p %{buildroot}%{_unitdir}/
+install -m 644 scripts/autoyast-initscripts.service %{buildroot}%{_unitdir}/
# Documentation
-install -d -m 755 $RPM_BUILD_ROOT/%{_prefix}/share/doc/packages/autoyast2/html
-tar xvpfC %{SOURCE1} $RPM_BUILD_ROOT/%{_prefix}/share/doc/packages/autoyast2/html
-mv $RPM_BUILD_ROOT/%{_prefix}/share/doc/packages/autoyast2/html/autoyast/* $RPM_BUILD_ROOT/%{_prefix}/share/doc/packages/autoyast2/html/
-rmdir $RPM_BUILD_ROOT/%{_prefix}/share/doc/packages/autoyast2/html/autoyast
+install -d -m 755 %{buildroot}%{yast_docdir}/html
+tar -xvpf %{SOURCE1} -C %{buildroot}%{yast_docdir}/html
+mv %{buildroot}%{yast_docdir}/html/autoyast/* %{buildroot}%{yast_docdir}/html/
+rmdir %{buildroot}%{yast_docdir}/html/autoyast
%post
%{fillup_only -n autoinstall}
%files
-%defattr(-,root,root)
-%dir /etc/autoinstall
+%dir %{_sysconfdir}/autoinstall
%dir %{yast_yncludedir}/autoinstall
-%dir /var/lib/autoinstall/repository
-%dir /var/lib/autoinstall/repository/templates
-%dir /var/lib/autoinstall/repository/rules
-%dir /var/lib/autoinstall/repository/classes
-%dir /var/lib/autoinstall/tmp
-%doc %{_prefix}/share/doc/packages/autoyast2
-
-%dir %yast_desktopdir
-%{yast_desktopdir}/autoyast.desktop
-%{yast_desktopdir}/clone_system.desktop
-/usr/share/autoinstall/modules/*.desktop
+%dir %{_localstatedir}/lib/autoinstall/repository
+%dir %{_localstatedir}/lib/autoinstall/repository/templates
+%dir %{_localstatedir}/lib/autoinstall/repository/rules
+%dir %{_localstatedir}/lib/autoinstall/repository/classes
+%dir %{_localstatedir}/lib/autoinstall/tmp
+%doc %{yast_docdir}
+
+%{yast_desktopdir}
+%{yast_metainfodir}
+%{_datadir}/autoinstall/modules/*.desktop
%dir %{yast_yncludedir}
%{yast_yncludedir}/autoinstall/classes.rb
%{yast_yncludedir}/autoinstall/conftree.rb
@@ -226,21 +228,20 @@
%{_fillupdir}/sysconfig.autoinstall
%files installation
-%defattr(-,root,root)
%dir %{yast_scrconfdir}
%{yast_scrconfdir}/autoinstall.scr
%{yast_scrconfdir}/cfg_autoinstall.scr
# DTD files
-%dir /usr/share/autoinstall
-#%dir /usr/share/autoinstall/dtd
-%dir /usr/share/autoinstall/modules
-#/usr/share/autoinstall/dtd/*
+%dir %{_datadir}/autoinstall
+#%dir %{_datadir}/autoinstall/dtd
+%dir %{_datadir}/autoinstall/modules
+#%{_datadir}/autoinstall/dtd/*
# systemd service file
%{_unitdir}/autoyast-initscripts.service
-%dir /usr/share/autoinstall/xslt
-/usr/share/autoinstall/xslt/merge.xslt
+%dir %{_datadir}/autoinstall/xslt
+%{_datadir}/autoinstall/xslt/merge.xslt
# config file
%dir %{yast_moduledir}
@@ -310,18 +311,18 @@
%{yast_libdir}/autoinstall/autoinst_issues/*.rb
# scripts
-%{_prefix}/lib/YaST2/bin/fetch_image.sh
-%{_prefix}/lib/YaST2/bin/autoyast-initscripts.sh
+%{yast_ybindir}/fetch_image.sh
+%{yast_ybindir}/autoyast-initscripts.sh
%license COPYING
-%dir /var/adm/autoinstall/
-%dir /var/adm/autoinstall/scripts
-%dir /var/adm/autoinstall/init.d
-%dir /var/adm/autoinstall/logs
-%dir /var/adm/autoinstall/files
-%dir /var/adm/autoinstall/cache
-%dir /var/lib/autoinstall
-%dir /var/lib/autoinstall/autoconf
+%dir %{_localstatedir}/adm/autoinstall/
+%dir %{_localstatedir}/adm/autoinstall/scripts
+%dir %{_localstatedir}/adm/autoinstall/init.d
+%dir %{_localstatedir}/adm/autoinstall/logs
+%dir %{_localstatedir}/adm/autoinstall/files
+%dir %{_localstatedir}/adm/autoinstall/cache
+%dir %{_localstatedir}/lib/autoinstall
+%dir %{_localstatedir}/lib/autoinstall/autoconf
%changelog
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/autoyast2-4.2.0/src/Makefile.am new/autoyast2-4.2.5/src/Makefile.am
--- old/autoyast2-4.2.0/src/Makefile.am 2019-04-30 15:34:18.000000000 +0200
+++ new/autoyast2-4.2.5/src/Makefile.am 2019-07-25 09:54:59.000000000 +0200
@@ -119,8 +119,8 @@
bin/fetch_image.sh
desktop_DATA = \
- desktop/autoyast.desktop \
- desktop/clone_system.desktop
+ desktop/org.opensuse.yast.AutoYaST.desktop \
+ desktop/org.opensuse.yast.CloneSystem.desktop
fillup_DATA = \
fillup/sysconfig.autoinstall
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/autoyast2-4.2.0/src/autoyast-rnc/partitioning.rnc new/autoyast2-4.2.5/src/autoyast-rnc/partitioning.rnc
--- old/autoyast2-4.2.0/src/autoyast-rnc/partitioning.rnc 2019-04-30 15:34:18.000000000 +0200
+++ new/autoyast2-4.2.5/src/autoyast-rnc/partitioning.rnc 2019-07-25 09:54:59.000000000 +0200
@@ -22,7 +22,8 @@
skip_list? &
partitions? &
raid_options? &
- bcache_options?
+ bcache_options? &
+ btrfs_options?
}
skip_list =
@@ -30,7 +31,7 @@
LIST,
skip_entry*
}
-skip_entry =
+skip_entry =
element listentry {
element skip_key { text } &
element skip_value { text } &
@@ -81,6 +82,7 @@
| create_subvolumes
| bcache_backing_for
| bcache_caching_for
+ | btrfs_name
partition = element partition { y2_partition* }
part_create =
@@ -135,6 +137,12 @@
cache_mode = element cache_mode { "writethrough" | "writeback" | "writearound" | "none" }
bcache_options = element bcache_options { cache_mode? }
+btrfs_name = element btrfs_name { text }
+
+btrfs_options = element btrfs_options { data_raid_level? & metadata_raid_level? }
+data_raid_level = element data_raid_level { text }
+metadata_raid_level = element metadata_raid_level { text }
+
subvolumes = element subvolumes {
LIST,
subvolume*
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/autoyast2-4.2.0/src/clients/files_auto.rb new/autoyast2-4.2.5/src/clients/files_auto.rb
--- old/autoyast2-4.2.0/src/clients/files_auto.rb 2019-04-30 15:34:18.000000000 +0200
+++ new/autoyast2-4.2.5/src/clients/files_auto.rb 2019-07-25 09:54:59.000000000 +0200
@@ -79,7 +79,7 @@
# Change configuration (run AutoSequence)
elsif @func == "Change"
Wizard.CreateDialog
- Wizard.SetDesktopIcon("autoyast2")
+ Wizard.SetDesktopIcon("org.opensuse.yast.AutoYaST")
@ret = CustomFileDialog()
Wizard.CloseDialog
elsif @func == "Packages"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/autoyast2-4.2.0/src/clients/inst_autosetup.rb new/autoyast2-4.2.5/src/clients/inst_autosetup.rb
--- old/autoyast2-4.2.0/src/clients/inst_autosetup.rb 2019-04-30 15:34:18.000000000 +0200
+++ new/autoyast2-4.2.5/src/clients/inst_autosetup.rb 2019-07-25 09:54:59.000000000 +0200
@@ -1,5 +1,24 @@
# encoding: utf-8
+# Copyright (c) [2013-2019] SUSE LLC
+#
+# All Rights Reserved.
+#
+# This program is free software; you can redistribute it and/or modify it
+# under the terms of version 2 of the GNU General Public License as published
+# by the Free Software Foundation.
+#
+# This program is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
+# more details.
+#
+# You should have received a copy of the GNU General Public License along
+# with this program; if not, contact SUSE LLC.
+#
+# To contact SUSE LLC about this file by physical or electronic mail, you may
+# find current contact information at www.suse.com.
+
# File: clients/inst_autosetup.ycp
# Package: Auto-installation
# Summary: Setup and prepare system for auto-installation
@@ -263,7 +282,6 @@
# moved here from autoinit for fate #301193
# needs testing
if Arch.s390
- dasd_or_zfcp = Profile.current.key?("dasd") || Profile.current.key?("zfcp")
if Builtins.haskey(Profile.current, "dasd")
Builtins.y2milestone("dasd found")
if Call.Function("dasd_auto", ["Import", Ops.get_map(Profile.current, "dasd", {})])
@@ -286,7 +304,11 @@
Progress.NextStage
- probe_storage if modified_profile? || dasd_or_zfcp
+ # Pre-scripts can modify the AutoYaST profile. Even more, a pre-script could change the initial
+ # disks layout/configuration (e.g., by creating a new partition). It is difficult to evaluate
+ # whether a pre-script has modified something related to storage devices, so a re-probing is always
+ # performed here (related to bsc#1133045).
+ probe_storage
if Profile.current["partitioning_advanced"] && !Profile.current["partitioning_advanced"].empty?
write_storage = AutoinstStorage.ImportAdvanced(Profile.current["partitioning_advanced"])
@@ -457,7 +479,8 @@
# Import Users configuration from profile
def autosetup_users
- users_config = ModuleConfigBuilder.build(Y2ModuleConfig.getModuleConfig("users"), Profile.current)
+ users_config = ModuleConfigBuilder.build(
+ Y2ModuleConfig.getModuleConfig("users"), Profile.current)
if users_config
Profile.remove_sections(users_config.keys)
Call.Function("users_auto", ["Import", users_config])
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/autoyast2-4.2.0/src/clients/scripts_auto.rb new/autoyast2-4.2.5/src/clients/scripts_auto.rb
--- old/autoyast2-4.2.0/src/clients/scripts_auto.rb 2019-04-30 15:34:18.000000000 +0200
+++ new/autoyast2-4.2.5/src/clients/scripts_auto.rb 2019-07-25 09:54:59.000000000 +0200
@@ -52,7 +52,7 @@
AutoinstScripts.SetModified
elsif @func == "Change"
Wizard.CreateDialog
- Wizard.SetDesktopIcon("autoyast")
+ Wizard.SetDesktopIcon("org.opensuse.yast.AutoYaST")
@ret = ScriptsDialog()
Wizard.CloseDialog
elsif @func == "Export"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/autoyast2-4.2.0/src/desktop/autoyast.desktop new/autoyast2-4.2.5/src/desktop/autoyast.desktop
--- old/autoyast2-4.2.0/src/desktop/autoyast.desktop 2019-04-30 15:34:18.000000000 +0200
+++ new/autoyast2-4.2.5/src/desktop/autoyast.desktop 1970-01-01 01:00:00.000000000 +0100
@@ -1,23 +0,0 @@
-[Desktop Entry]
-Type=Application
-Categories=Settings;System;Qt;X-SuSE-YaST;X-SuSE-YaST-Misc;
-
-X-KDE-ModuleType=Library
-X-KDE-HasReadOnlyMode=true
-X-SuSE-YaST-Call=autoyast
-
-X-SuSE-YaST-Group=Misc
-X-SuSE-YaST-Argument=
-X-SuSE-YaST-RootOnly=true
-X-SuSE-YaST-AutoInst=
-X-SuSE-YaST-Geometry=
-X-SuSE-YaST-SortKey=
-X-SuSE-YaST-AutoInstResource=
-X-SuSE-YaST-Keywords=autoyast,installation
-
-Icon=yast-autoyast
-Exec=/usr/bin/xdg-su -c '/sbin/yast2 autoyast'
-
-Name=Autoinstallation Configuration
-GenericName=Configuration system for autoinstallation
-StartupNotify=true
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/autoyast2-4.2.0/src/desktop/clone_system.desktop new/autoyast2-4.2.5/src/desktop/clone_system.desktop
--- old/autoyast2-4.2.0/src/desktop/clone_system.desktop 2019-04-30 15:34:18.000000000 +0200
+++ new/autoyast2-4.2.5/src/desktop/clone_system.desktop 1970-01-01 01:00:00.000000000 +0100
@@ -1,23 +0,0 @@
-[Desktop Entry]
-Type=Application
-Categories=Settings;System;Qt;X-SuSE-YaST;X-SuSE-YaST-Misc;
-
-X-KDE-ModuleType=Library
-X-KDE-HasReadOnlyMode=true
-X-SuSE-YaST-Call=clone_system
-
-X-SuSE-YaST-Group=Misc
-X-SuSE-YaST-Argument=
-X-SuSE-YaST-RootOnly=true
-X-SuSE-YaST-AutoInst=
-X-SuSE-YaST-Geometry=
-X-SuSE-YaST-SortKey=
-X-SuSE-YaST-AutoInstResource=
-X-SuSE-YaST-Keywords=autoyast,installation,clone
-
-Icon=yast-autoyast
-Exec=/usr/bin/xdg-su -c '/sbin/yast2 clone_system'
-
-Name=Autoinstallation Cloning System
-GenericName=Creating AutoYaST configuration file
-StartupNotify=true
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/autoyast2-4.2.0/src/desktop/org.opensuse.yast.AutoYaST.desktop new/autoyast2-4.2.5/src/desktop/org.opensuse.yast.AutoYaST.desktop
--- old/autoyast2-4.2.0/src/desktop/org.opensuse.yast.AutoYaST.desktop 1970-01-01 01:00:00.000000000 +0100
+++ new/autoyast2-4.2.5/src/desktop/org.opensuse.yast.AutoYaST.desktop 2019-07-25 09:54:59.000000000 +0200
@@ -0,0 +1,24 @@
+[Desktop Entry]
+Type=Application
+Categories=Settings;System;Qt;X-SuSE-YaST;X-SuSE-YaST-Misc;
+
+X-KDE-ModuleType=Library
+X-KDE-HasReadOnlyMode=true
+X-SuSE-YaST-Call=autoyast
+
+X-SuSE-YaST-Group=Misc
+X-SuSE-YaST-Argument=
+X-SuSE-YaST-RootOnly=true
+X-SuSE-YaST-AutoInst=
+X-SuSE-YaST-Geometry=
+X-SuSE-YaST-SortKey=
+X-SuSE-YaST-AutoInstResource=
+X-SuSE-YaST-Keywords=autoyast,installation
+
+Icon=yast-autoyast
+Exec=/usr/bin/xdg-su -c '/sbin/yast2 autoyast'
+
+Name=YaST Autoinstallation
+GenericName=Autoinstallation Configuration
+Comment=Configuration system for autoinstallation
+StartupNotify=true
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/autoyast2-4.2.0/src/desktop/org.opensuse.yast.CloneSystem.desktop new/autoyast2-4.2.5/src/desktop/org.opensuse.yast.CloneSystem.desktop
--- old/autoyast2-4.2.0/src/desktop/org.opensuse.yast.CloneSystem.desktop 1970-01-01 01:00:00.000000000 +0100
+++ new/autoyast2-4.2.5/src/desktop/org.opensuse.yast.CloneSystem.desktop 2019-07-25 09:54:59.000000000 +0200
@@ -0,0 +1,24 @@
+[Desktop Entry]
+Type=Application
+Categories=Settings;System;Qt;X-SuSE-YaST;X-SuSE-YaST-Misc;
+
+X-KDE-ModuleType=Library
+X-KDE-HasReadOnlyMode=true
+X-SuSE-YaST-Call=clone_system
+
+X-SuSE-YaST-Group=Misc
+X-SuSE-YaST-Argument=
+X-SuSE-YaST-RootOnly=true
+X-SuSE-YaST-AutoInst=
+X-SuSE-YaST-Geometry=
+X-SuSE-YaST-SortKey=
+X-SuSE-YaST-AutoInstResource=
+X-SuSE-YaST-Keywords=autoyast,installation,clone
+
+Icon=yast-autoyast
+Exec=/usr/bin/xdg-su -c '/sbin/yast2 clone_system'
+
+Name=YaST Clone System
+GenericName=Autoinstallation Cloning System
+Comment=Create an AutoYaST configuration file for cloning the system
+StartupNotify=true
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/autoyast2-4.2.0/src/include/autoinstall/dialogs.rb new/autoyast2-4.2.5/src/include/autoinstall/dialogs.rb
--- old/autoyast2-4.2.0/src/include/autoinstall/dialogs.rb 2019-04-30 15:34:18.000000000 +0200
+++ new/autoyast2-4.2.5/src/include/autoinstall/dialogs.rb 2019-07-25 09:54:59.000000000 +0200
@@ -27,7 +27,7 @@
# @return [Symbol]
def Settings
Wizard.CreateDialog
- Wizard.SetDesktopIcon("autoyast")
+ Wizard.SetDesktopIcon("org.opensuse.yast.AutoYaST")
contents = HVSquash(
VBox(
VSquash(
@@ -215,7 +215,7 @@
Wizard.CreateDialog
- Wizard.SetDesktopIcon("groups")
+ Wizard.SetDesktopIcon("org.opensuse.yast.CloneSystem")
# title