diff --git a/tests/vmcheck/overlay.sh b/tests/vmcheck/overlay.sh index 64693b21..80ed4b0f 100755 --- a/tests/vmcheck/overlay.sh +++ b/tests/vmcheck/overlay.sh @@ -77,8 +77,13 @@ ostree checkout $commit vmcheck --fsync=0 rm -f vmcheck/usr/etc/{.pwd.lock,passwd-,group-,shadow-,gshadow-,subuid-,subgid-} # ✀✀✀ END hack for https://github.com/projectatomic/rpm-ostree/pull/693 ✀✀✀ rm vmcheck/etc -rf -# Now, overlay our built binaries -rsync -rlv /var/roothome/sync/insttree/usr/ vmcheck/usr/ + +# Now, overlay our built binaries & config files +INSTTREE=/var/roothome/sync/insttree +rsync -rlv $INSTTREE/usr/ vmcheck/usr/ +if [ -d $INSTTREE/etc ]; then # on CentOS, the dbus service file is in /usr + rsync -rlv $INSTTREE/etc/ vmcheck/usr/etc/ +fi ostree refs --delete vmcheck || true ostree commit -b vmcheck -s '' --tree=dir=vmcheck --link-checkout-speedup ostree admin deploy vmcheck