Hello community, here is the log from the commit of package caasp-tools for openSUSE:Factory checked in at 2017-09-13 22:37:01 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/caasp-tools (Old) and /work/SRC/openSUSE:Factory/.caasp-tools.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "caasp-tools" Wed Sep 13 22:37:01 2017 rev:10 rq:523892 version:0.24 Changes: -------- --- /work/SRC/openSUSE:Factory/caasp-tools/caasp-tools.changes 2017-08-30 16:23:39.905591325 +0200 +++ /work/SRC/openSUSE:Factory/.caasp-tools.new/caasp-tools.changes 2017-09-13 22:37:21.700253957 +0200 @@ -1,0 +2,6 @@ +Tue Sep 12 10:18:48 CEST 2017 - ku...@suse.de + +- setup-fstab.sys-for-overlayfs: adjust to work with building + images with kiwi + +------------------------------------------------------------------- Old: ---- MicroOS-tools-0.23.tar.bz2 New: ---- MicroOS-tools-0.24.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ caasp-tools.spec ++++++ --- /var/tmp/diff_new_pack.Ye6Rp3/_old 2017-09-13 22:37:23.348021955 +0200 +++ /var/tmp/diff_new_pack.Ye6Rp3/_new 2017-09-13 22:37:23.352021392 +0200 @@ -17,7 +17,7 @@ Name: caasp-tools -Version: 0.23 +Version: 0.24 Release: 0 Summary: Files and Scripts for SUSE CaaS Platform License: GPL-2.0+ ++++++ MicroOS-tools-0.23.tar.bz2 -> MicroOS-tools-0.24.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/MicroOS-tools-0.23/usr/sbin/setup-fstab.sys-for-overlayfs new/MicroOS-tools-0.24/usr/sbin/setup-fstab.sys-for-overlayfs --- old/MicroOS-tools-0.23/usr/sbin/setup-fstab.sys-for-overlayfs 2017-06-07 17:34:23.101602867 +0200 +++ new/MicroOS-tools-0.24/usr/sbin/setup-fstab.sys-for-overlayfs 2017-09-12 10:17:44.721911367 +0200 @@ -1,8 +1,11 @@ #!/bin/bash -test -f /etc/fstab || exit 1 - -grep "/var/lib/overlay" /etc/fstab | grep -v "^#" > /etc/fstab.sys +if [ -f /etc/fstab ]; then + grep "/var/lib/overlay" /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/lib/overlay btrfs defaults,subvol=@/var/lib/overlay 0 0" > /etc/fstab.sys +fi # /etc/fstab.sys for dracut to mount overlayfs cat << EOF >> /etc/fstab.sys @@ -10,4 +13,3 @@ overlay /var/adm/netconfig overlay defaults,lowerdir=/sysroot/var/adm/netconfig,upperdir=/sysroot/var/lib/overlay/netconfig,workdir=/sysroot/var/lib/overlay/work-netconfig 0 0 overlay /var/lib/apparmor overlay defaults,lowerdir=/sysroot/var/lib/apparmor,upperdir=/sysroot/var/lib/overlay/apparmor,workdir=/sysroot/var/lib/overlay/work-apparmor 0 0 EOF -
