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

libpriv: Add more error-prefixing in sanity checks

Browse Source 
Currently tracing through an error around that area, and this would've
helped.

Closes: #1787
Approved by: cgwalters
This commit is contained in:
Jonathan Lebon 2019-03-18 11:53:28 -04:00 committed by Atomic Bot
parent da3b33ee7b
commit 078268d4d3
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/libpriv/rpmostree-scripts.c
View File

@ -1014,7 +1014,7 @@ rpmostree_deployment_sanitycheck_true (int rootfs_fd,
if (getenv ("RPMOSTREE_SKIP_SANITYCHECK"))
return TRUE;
GLNX_AUTO_PREFIX_ERROR ("sanitycheck", error);
GLNX_AUTO_PREFIX_ERROR ("Sanity-checking final rootfs", error);
g_autoptr(RpmOstreeBwrap) bwrap =
rpmostree_bwrap_new (rootfs_fd, RPMOSTREE_BWRAP_IMMUTABLE, error);
@ -1061,6 +1061,8 @@ rpmostree_deployment_sanitycheck_rpmdb (int rootfs_fd,
GCancellable *cancellable,
GError **error)
{
GLNX_AUTO_PREFIX_ERROR ("Sanity-checking final rpmdb", error);
g_autoptr(RpmOstreeRefSack) sack = rpmostree_get_refsack_for_root (rootfs_fd, ".", error);
if (!sack)
return FALSE;

2
tests/vmcheck/test-layering-scripts.sh
View File

@ -220,7 +220,7 @@ if vm_rpmostree install rmrf 2>err.txt; then
fi
vm_cmd test -f /home/testuser/somedata -a -f /etc/fstab -a -f /tmp/sometmpfile -a -f /var/tmp/sometmpfile
# This is the error today, we may improve it later
assert_file_has_content err.txt 'error: sanitycheck: Executing bwrap(/usr/bin/true)'
assert_file_has_content err.txt 'error: Sanity-checking final rootfs: Executing bwrap(/usr/bin/true)'
echo "ok impervious to rm -rf post"
# capabilities