keremet/rpm-ostree
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

overlay.sh: also overlay /etc to /usr/etc

Browse Source 
This is needed to test changes to the D-Bus config file.

Closes: #894
Approved by: cgwalters
This commit is contained in:
Jonathan Lebon 2017-07-27 08:25:38 -07:00 committed by Atomic Bot
parent 95bc93205e
commit ddc0f40355
1 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
tests/vmcheck/overlay.sh
View File

@ -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