Hello community, here is the log from the commit of package caasp-tools for openSUSE:Factory checked in at 2018-02-28 20:02:34 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/caasp-tools (Old) and /work/SRC/openSUSE:Factory/.caasp-tools.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "caasp-tools" Wed Feb 28 20:02:34 2018 rev:16 rq:580651 version:0.28 Changes: -------- --- /work/SRC/openSUSE:Factory/caasp-tools/caasp-tools.changes 2018-02-22 15:01:09.988765754 +0100 +++ /work/SRC/openSUSE:Factory/.caasp-tools.new/caasp-tools.changes 2018-02-28 20:02:34.588301154 +0100 @@ -1,0 +2,7 @@ +Tue Feb 27 16:44:23 CET 2018 - [email protected] + +- Remove read-only root filesystem stuff, was moved to + read-only-root-fs +- Require read-only-root-fs + +------------------------------------------------------------------- Old: ---- MicroOS-tools-0.27.tar.bz2 New: ---- MicroOS-tools-0.28.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ caasp-tools.spec ++++++ --- /var/tmp/diff_new_pack.a5EwYz/_old 2018-02-28 20:02:35.436270473 +0100 +++ /var/tmp/diff_new_pack.a5EwYz/_new 2018-02-28 20:02:35.440270328 +0100 @@ -17,7 +17,7 @@ Name: caasp-tools -Version: 0.27 +Version: 0.28 Release: 0 Summary: Files and Scripts for SUSE CaaS Platform License: GPL-2.0-or-later @@ -27,23 +27,15 @@ Source2: COPYING Source3: cc_suse_caasp.py BuildRequires: distribution-release -%if 0%{?suse_version} < 1330 -BuildRequires: python2-base -%else BuildRequires: python3-base -%endif BuildRequires: salt-minion Requires: perl-JSON -#only needed as directory owners -# Requires: distribution-release systemd udev -Requires: util-linux -Requires(post): awk -%{?systemd_requires} -BuildRoot: %{_tmppath}/%{name}-%{version}-build +Requires: read-only-root-fs BuildArch: noarch %description -Files, scripts and directories for SUSE Containers as a Service Platform. +Files, scripts and directories for SUSE CaaS Platform and +openSUSE Kubic. %prep %setup -q -n MicroOS-tools-%{version} @@ -52,27 +44,16 @@ %install cp -a * %{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}%{_localstatedir}/adm/netconfig -mkdir -p %{buildroot}%{_localstatedir}/lib/overlay -mkdir -p %{buildroot}%{_localstatedir}/lib/overlay/etc -mkdir -p %{buildroot}%{_localstatedir}/lib/overlay/work-etc -mkdir -p %{buildroot}%{_localstatedir}/lib/overlay/netconfig -mkdir -p %{buildroot}%{_localstatedir}/lib/overlay/work-netconfig -mkdir -p %{buildroot}%{_localstatedir}/lib/overlay/apparmor -mkdir -p %{buildroot}%{_localstatedir}/lib/overlay/work-apparmor mkdir -p %{buildroot}%{_mandir}/man8 pod2man %{SOURCE1} > %{buildroot}%{_mandir}/man8/create_autoyast_profile.8 mkdir -p %{buildroot}%{_docdir}/%{name} -install -D -m644 %{SOURCE2} %{buildroot}%{_docdir}/%{name}/COPYING -%if 0%{?suse_version} < 1330 -install -D -m644 %{SOURCE3} %{buildroot}%{python_sitelib}/cloudinit/config/cc_suse_caasp.py -%else install -D -m644 %{SOURCE3} %{buildroot}%{python3_sitelib}/cloudinit/config/cc_suse_caasp.py -%endif %if ! 0%{?is_susecaasp} -mkdir -p %{buildroot}/usr/share/caasp-container-manifests +mkdir -p %{buildroot}%{_datadir}/caasp-container-manifests echo -e "#!/bin/bash\ntrue" > %{buildroot}%{_datadir}/caasp-container-manifests/activate.sh chmod 755 %{buildroot}%{_datadir}/caasp-container-manifests/activate.sh %endif @@ -81,9 +62,6 @@ %service_add_pre adjust-cloud-cfg.service setup-salt-minion.service %post -if [ -f /etc/fstab -a ! -f /etc/fstab.sys ]; then - /usr/sbin/setup-fstab.sys-for-overlayfs ||: -fi %service_add_post adjust-cloud-cfg.service setup-salt-minion.service exit 0 @@ -94,8 +72,7 @@ %service_del_postun adjust-cloud-cfg.service setup-salt-minion.service %files -%defattr(-,root,root) -%doc %{_docdir}/%{name} +%license COPYING %config %{_sysconfdir}/systemd/system/systemd-firstboot.service %config %{_sysconfdir}/salt/minion.d/grains_refresh.conf %{_unitdir} @@ -103,13 +80,7 @@ %{_libexecdir}/python* %{_sbindir}/adjust-cloud-cfg %{_sbindir}/create_autoyast_profile -%{_sbindir}/setup-fstab.sys-for-overlayfs %{_mandir}/man8/create_autoyast_profile.8* -%{_localstatedir}/lib/overlay -%dir %{_localstatedir}/adm/netconfig -%dir %{_prefix}/lib/dracut -%dir %{_prefix}/lib/dracut/modules.d -%{_prefix}/lib/dracut/modules.d/99SUSE_MicroOS %if ! 0%{?is_susecaasp} %dir %{_datadir}/caasp-container-manifests %{_datadir}/caasp-container-manifests/activate.sh ++++++ MicroOS-tools-0.27.tar.bz2 -> MicroOS-tools-0.28.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/MicroOS-tools-0.27/usr/lib/dracut/modules.d/99SUSE_MicroOS/module-setup.sh new/MicroOS-tools-0.28/usr/lib/dracut/modules.d/99SUSE_MicroOS/module-setup.sh --- old/MicroOS-tools-0.27/usr/lib/dracut/modules.d/99SUSE_MicroOS/module-setup.sh 2017-02-08 12:47:31.922981801 +0100 +++ new/MicroOS-tools-0.28/usr/lib/dracut/modules.d/99SUSE_MicroOS/module-setup.sh 1970-01-01 01:00:00.000000000 +0100 @@ -1,14 +0,0 @@ -check() { - return 0 -} - -# called by dracut -depends() { - echo "systemd-initrd" - return 0 -} - -installkernel() { - hostonly='' instmods overlay - return 0 -} diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/MicroOS-tools-0.27/usr/sbin/setup-fstab.sys-for-overlayfs new/MicroOS-tools-0.28/usr/sbin/setup-fstab.sys-for-overlayfs --- old/MicroOS-tools-0.27/usr/sbin/setup-fstab.sys-for-overlayfs 2017-12-20 19:02:43.930403881 +0100 +++ new/MicroOS-tools-0.28/usr/sbin/setup-fstab.sys-for-overlayfs 1970-01-01 01:00:00.000000000 +0100 @@ -1,13 +0,0 @@ -#!/bin/bash - -if [ -f /etc/fstab ]; then - grep "/var" /etc/fstab | grep -v "^#" > /etc/fstab.sys -else - # if there is no /etc/fstab, assume LABEL=ROOT. Most likely we are called by kiwi - echo "LABEL=ROOT /var btrfs defaults,subvol=@/var 0 0" > /etc/fstab.sys -fi - -# /etc/fstab.sys for dracut to mount overlayfs -cat << EOF >> /etc/fstab.sys -overlay /etc overlay defaults,lowerdir=/sysroot/etc,upperdir=/sysroot/var/lib/overlay/etc,workdir=/sysroot/var/lib/overlay/work-etc 0 0 -EOF
