From 24cbf521df7672627ce45e12b1a6c0013f89a3dc Mon Sep 17 00:00:00 2001 From: Ian Wienand Date: Fri, 16 Nov 2018 21:22:20 +1100 Subject: [PATCH] fedora mirror : drop -p from rsync As described in [1], upstream mirrors have started putting setgid bits on some directories starting with Fedora 29. As you need admin permissions on AFS to set this, we need to disable -p and just take our own umask for the mirroring to work. [1] https://pagure.io/releng/issue/7921 Change-Id: Id24196791f80cd99fe8a330fb2c7c6d893fc9995 --- .../files/mirror/fedora-mirror-update.sh | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/modules/openstack_project/files/mirror/fedora-mirror-update.sh b/modules/openstack_project/files/mirror/fedora-mirror-update.sh index d83ff3210c..f372d9924f 100644 --- a/modules/openstack_project/files/mirror/fedora-mirror-update.sh +++ b/modules/openstack_project/files/mirror/fedora-mirror-update.sh @@ -19,6 +19,10 @@ BASE="/afs/.openstack.org/mirror/fedora" # NOTE(pabelanger): #fedora-admin: # tibbs | I run pubmirror[12].math.uh.edu. # tibbs | It polls the masters every ten minutes. +# NOTE(ianw): 2018-11 we dropped "-p" from the rsync commands +# because upstream starting putting setgid bits on directories, +# which you have to have admin permissions in AFS to set. +# https://pagure.io/releng/issue/7921 MIRROR="rsync://pubmirror1.math.uh.edu/fedora-buffet/fedora/linux" K5START="k5start -t -f /etc/fedora.keytab service/fedora-mirror -- timeout -k 2m 30m" @@ -29,7 +33,7 @@ for REPO in releases/27 releases/28 releases/29; do date --iso-8601=ns echo "Running rsync releases..." - $K5START rsync -rlptDvz \ + $K5START rsync -rltDvz \ --delete \ --delete-excluded \ --exclude="Cloud/x86_64/images/*.box" \ @@ -54,7 +58,7 @@ for REPO in updates/27 updates/28 updates/29 ; do date --iso-8601=ns echo "Running rsync updates..." - $K5START rsync -rlptDvz \ + $K5START rsync -rltDvz \ --delete \ --delete-excluded \ --exclude="aarch64/" \