vmcheck: Drop selinux-policy hack
This shouldn't be necessary anymore. Closes: #1274 Approved by: cgwalters
This commit is contained in:
parent
ad8e9b6de8
commit
0874152ba6
@ -13,26 +13,9 @@ if test -z "${INSIDE_VM:-}"; then
|
|||||||
|
|
||||||
vm_rsync
|
vm_rsync
|
||||||
|
|
||||||
# ✀✀✀ BEGIN selinux-policy hack (part 1) for
|
vm_cmd env \
|
||||||
# https://github.com/fedora-selinux/selinux-policy-contrib/pull/45
|
RPMOSTREE_TEST_NO_OVERLAY="${RPMOSTREE_TEST_NO_OVERLAY:-}" \
|
||||||
selhack=selinux-tmp-hack
|
INSIDE_VM=1 /var/roothome/sync/tests/vmcheck/overlay.sh
|
||||||
if ! vm_cmd sesearch -A -s init_t -t install_t -c dbus | grep -q allow; then
|
|
||||||
echo "Activating selinux-tmp-hack"
|
|
||||||
d=$(mktemp -d)
|
|
||||||
cat > $d/$selhack.te << 'EOF'
|
|
||||||
policy_module(selinux-tmp-hack, 1.0.0)
|
|
||||||
gen_require(`
|
|
||||||
type install_t;
|
|
||||||
')
|
|
||||||
init_dbus_chat(install_t)
|
|
||||||
EOF
|
|
||||||
make -C $d -f /usr/share/selinux/devel/Makefile $selhack.pp
|
|
||||||
vm_send /var/roothome/sync $d/$selhack.pp
|
|
||||||
rm -rf $d
|
|
||||||
fi
|
|
||||||
# ✀✀✀ END selinux-policy hack ✀✀✀
|
|
||||||
|
|
||||||
vm_cmd env RPMOSTREE_TEST_NO_OVERLAY="${RPMOSTREE_TEST_NO_OVERLAY:-}" INSIDE_VM=1 /var/roothome/sync/tests/vmcheck/overlay.sh
|
|
||||||
vm_reboot
|
vm_reboot
|
||||||
exit 0
|
exit 0
|
||||||
fi
|
fi
|
||||||
@ -80,20 +63,6 @@ else
|
|||||||
echo "Skipping overlay of built rpm-ostree"
|
echo "Skipping overlay of built rpm-ostree"
|
||||||
fi
|
fi
|
||||||
|
|
||||||
## ✀✀✀ BEGIN selinux-policy hack (part 2) for
|
|
||||||
## https://github.com/fedora-selinux/selinux-policy-contrib/pull/45
|
|
||||||
selhack=selinux-tmp-hack
|
|
||||||
pp=/var/roothome/sync/$selhack.pp
|
|
||||||
if [ -f $pp ]; then
|
|
||||||
seld=usr/share/selinux/packages/$selhack
|
|
||||||
mkdir -p vmcheck/$seld
|
|
||||||
cp $pp vmcheck/$seld
|
|
||||||
mkdir vmcheck/var/tmp # bwrap wrapper will mount tmpfs there
|
|
||||||
/var/roothome/sync/scripts/bwrap-script-shell.sh /ostree/repo/tmp/vmcheck \
|
|
||||||
semodule -v -n -i /$seld/$selhack.pp
|
|
||||||
fi
|
|
||||||
## ✀✀✀ END selinux-policy hack ✀✀✀
|
|
||||||
|
|
||||||
# ✀✀✀ BEGIN hack to get --keep-metadata
|
# ✀✀✀ BEGIN hack to get --keep-metadata
|
||||||
if ! ostree commit --help | grep -q -e --keep-metadata; then
|
if ! ostree commit --help | grep -q -e --keep-metadata; then
|
||||||
# this is fine, rsync doesn't modify in place
|
# this is fine, rsync doesn't modify in place
|
||||||
|
Loading…
Reference in New Issue
Block a user