Hello community, here is the log from the commit of package caasp-tools for openSUSE:Factory checked in at 2018-06-19 12:04:17 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/caasp-tools (Old) and /work/SRC/openSUSE:Factory/.caasp-tools.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "caasp-tools" Tue Jun 19 12:04:17 2018 rev:18 rq:617299 version:1.0+git20180615.b5e9b2d Changes: -------- --- /work/SRC/openSUSE:Factory/caasp-tools/caasp-tools.changes 2018-03-06 10:49:29.667501644 +0100 +++ /work/SRC/openSUSE:Factory/.caasp-tools.new/caasp-tools.changes 2018-06-19 12:04:19.920542759 +0200 @@ -1,0 +2,43 @@ +Sun Jun 17 09:51:32 CEST 2018 - [email protected] + +- Create /var/adm/netconfig in %posttrans if still needed after + upgrade + +------------------------------------------------------------------- +Fri Jun 15 12:43:37 CEST 2018 - [email protected] + +- Update to version 1.0+git20180615.b5e9b2d: + * Move log file to /var/log, add timestamp + +------------------------------------------------------------------- +Fri Jun 15 12:37:21 CEST 2018 - [email protected] + +- Fix name of migration script + +------------------------------------------------------------------- +Fri Jun 15 11:11:03 CEST 2018 - [email protected] + +- Update to version 1.0+git20180615.6204c42: + * Save output in logfile +- Fix /var/lock symlink for migration from CaaSP v3 to v4. + +------------------------------------------------------------------- +Wed Jun 13 14:37:56 UTC 2018 - [email protected] + +- Update to version 1.0+git20180613.53ac895: + * Add migrate-ntp2chrony +- Call migrate-ntp2chrony from posttrans section + +------------------------------------------------------------------- +Wed Jun 13 12:20:34 UTC 2018 - [email protected] + +- Update to version 1.0+git20180613.b7f1fb1: + * Replace activate.sh call with admin-node-init.service + +------------------------------------------------------------------- +Wed Jun 13 11:47:00 UTC 2018 - [email protected] + +- Update to version 1.0+git20180613.dddd750: + * Add README.md + +------------------------------------------------------------------- Old: ---- COPYING MicroOS-tools-0.28.tar.bz2 cc_suse_caasp.py New: ---- _service _servicedata microos-tools-1.0+git20180615.b5e9b2d.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ caasp-tools.spec ++++++ --- /var/tmp/diff_new_pack.LfgnYG/_old 2018-06-19 12:04:20.500521226 +0200 +++ /var/tmp/diff_new_pack.LfgnYG/_new 2018-06-19 12:04:20.504521077 +0200 @@ -17,18 +17,18 @@ Name: caasp-tools -Version: 0.28 +Version: 1.0+git20180615.b5e9b2d Release: 0 Summary: Files and Scripts for SUSE CaaS Platform License: GPL-2.0-or-later Group: Development/Tools/Other -Source0: MicroOS-tools-%{version}.tar.bz2 +Url: https://github.com/kubic-project/microos-tools +Source0: microos-tools-%{version}.tar.xz Source1: create_autoyast_profile.pl -Source2: COPYING -Source3: cc_suse_caasp.py BuildRequires: distribution-release BuildRequires: python3-base BuildRequires: salt-minion +Requires: ntp2chrony Requires: perl-JSON Requires: read-only-root-fs BuildArch: noarch @@ -38,27 +38,25 @@ openSUSE Kubic. %prep -%setup -q -n MicroOS-tools-%{version} +%setup -q -n microos-tools-%{version} %build %install -cp -a * %{buildroot} +cp -a {etc,usr} %{buildroot} # Copy the COPYING file for files section -cp -p %{SOURCE2} . mkdir -p %{buildroot}%{_sbindir} install %{SOURCE1} %{buildroot}%{_sbindir}/create_autoyast_profile mkdir -p %{buildroot}%{_mandir}/man8 pod2man %{SOURCE1} > %{buildroot}%{_mandir}/man8/create_autoyast_profile.8 mkdir -p %{buildroot}%{_docdir}/%{name} -install -D -m644 %{SOURCE3} %{buildroot}%{python3_sitelib}/cloudinit/config/cc_suse_caasp.py +install -D -m644 cloud-init/cc_suse_caasp.py %{buildroot}%{python3_sitelib}/cloudinit/config/cc_suse_caasp.py %pre %service_add_pre adjust-cloud-cfg.service setup-salt-minion.service %post %service_add_post adjust-cloud-cfg.service setup-salt-minion.service -exit 0 %preun %service_del_preun adjust-cloud-cfg.service setup-salt-minion.service @@ -66,6 +64,24 @@ %postun %service_del_postun adjust-cloud-cfg.service setup-salt-minion.service +%posttrans +# Switch from ntp to chrony +/usr/sbin/migrate-ntp2chrony ||: +# During migration from CaaSP v3 to v4 /var/lock was +# removed from filesystem and systemd cannot create it. +# Only do this if /var is normally not writeable. +if [ ! -e /var/lock ]; then + mount --fake /var 2>/dev/null || ln -sf /run/lock /var/lock +fi +# During migration from CaaSP v3 to v4 /var/adm/netconfig was +# removed and netconfig cannot create it. +# Only do this if /var is normally not writeable. +if [ ! -e /var/adm/netconfig ]; then + mount --fake /var 2>/dev/null || mkdir -p /var/adm/netconfig +fi + +exit 0 + %files %license COPYING %config %{_sysconfdir}/systemd/system/systemd-firstboot.service @@ -75,6 +91,7 @@ %{_libexecdir}/python* %{_sbindir}/adjust-cloud-cfg %{_sbindir}/create_autoyast_profile +%{_sbindir}/migrate-ntp2chrony %{_mandir}/man8/create_autoyast_profile.8* %changelog ++++++ _service ++++++ <services> <service name="tar_scm" mode="disabled"> <param name="version">1.0</param> <param name="versionformat">1.0+git%cd.%h</param> <param name="url">git://github.com/kubic-project/microos-tools.git</param> <param name="scm">git</param> <param name="changesgenerate">enable</param> </service> <service name="recompress" mode="disabled"> <param name="compression">xz</param> <param name="file">*.tar</param> </service> <service name="set_version" mode="disabled"/> </services> ++++++ _servicedata ++++++ <servicedata> <service name="tar_scm"> <param name="url">git://github.com/kubic-project/microos-tools.git</param> <param name="changesrevision">b5e9b2def724d24fde0d559cc2c572890df62557</param> </service> </servicedata>
