mirror of
https://github.com/projectatomic/atomic.git
synced 2026-02-05 09:44:59 +01:00
.redhat-ci.sh: Correct avoid selinux issues
At present, when overlayfs is used on RHEL and Centos to unlock ostree, selinux and permissions get set with the wrong permissions. This is a work-around for now. Closes: #896 Approved by: jlebon
This commit is contained in:
@@ -5,15 +5,22 @@ NO_TEST=${NO_TEST:-}
|
||||
mount --make-rshared /
|
||||
|
||||
|
||||
if [ -f /run/ostree-booted ]; then
|
||||
if [ -f /run/ostree-booted ] && grep -q ID=fedora /etc/os-release; then
|
||||
if [ ! -e /var/tmp/ostree-unlock-ovl.* ]; then
|
||||
ostree admin unlock
|
||||
fi
|
||||
elif [ -f /run/ostree-booted ]; then
|
||||
# Until overlayfs and selinux get along, use remount
|
||||
# instead of ostree admin unlock
|
||||
if [ ! -w /usr ]; then
|
||||
mount -o remount,rw /usr
|
||||
fi
|
||||
else
|
||||
dnf install -y atomic python3-coverage
|
||||
fi
|
||||
|
||||
systemctl start docker
|
||||
# Restarting docker helps with permissions related to above.
|
||||
systemctl restart docker
|
||||
|
||||
# somewhat mimic the spec conditional
|
||||
source /etc/os-release
|
||||
|
||||
Reference in New Issue
Block a user