From nobody Tue Apr 23 09:48:30 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of redhat.com designates 209.132.183.28 as permitted sender) client-ip=209.132.183.28; envelope-from=libvir-list-bounces@redhat.com; helo=mx1.redhat.com; Authentication-Results: mx.zohomail.com; spf=pass (zoho.com: domain of redhat.com designates 209.132.183.28 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1565274845; cv=none; d=zoho.com; s=zohoarc; b=A16ep0RIocJSpu95J+CIHM0sHOfA91nwpjeNFHvvNEI0eF4Ocaeh856LsAmv38gVLA0vuhA10yKDhgY7PL73cmFUCGWk7rcX7Y3L+pW7rA+53YA9SNFRox4xsgpqwANodMLzL7WBllBHQkkOFuzGDwFh1sdCXJVQlWM/p16EdHo= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1565274845; h=Content-Type:Content-Transfer-Encoding:Date:From:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:Sender:Subject:To:ARC-Authentication-Results; bh=B5Eaww0HYunFNAflhRKcehcMvs51B/O1k2baJHlbwTg=; b=VNtVEQm21bI4cEpgN1tf2pzg9LwxBCnMIvPHqCM2iiyRQuBZr4GUfPQJdJXuhAJTuxulwwdvzTvweL4le2Ol/wuAPNx0KxoaGnGy9MBjzSaQ3fVv98P5iHKx8/QKjtjrXsqll5osuw71sRO68svpjTltD/gsluoakmLFxnABE6A= ARC-Authentication-Results: i=1; mx.zoho.com; spf=pass (zoho.com: domain of redhat.com designates 209.132.183.28 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass header.from= (p=none dis=none) header.from= Return-Path: Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) by mx.zohomail.com with SMTPS id 1565274845729509.8852743305796; Thu, 8 Aug 2019 07:34:05 -0700 (PDT) Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 4A7B92F366F; Thu, 8 Aug 2019 14:34:04 +0000 (UTC) Received: from colo-mx.corp.redhat.com (colo-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.20]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 935FA600C8; Thu, 8 Aug 2019 14:34:03 +0000 (UTC) Received: from lists01.pubmisc.prod.ext.phx2.redhat.com (lists01.pubmisc.prod.ext.phx2.redhat.com [10.5.19.33]) by colo-mx.corp.redhat.com (Postfix) with ESMTP id CC67318089C8; Thu, 8 Aug 2019 14:34:02 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id x78EY0Jo019406 for ; Thu, 8 Aug 2019 10:34:00 -0400 Received: by smtp.corp.redhat.com (Postfix) id E8D7960BF1; Thu, 8 Aug 2019 14:34:00 +0000 (UTC) Received: from blue.redhat.com (ovpn-116-93.phx2.redhat.com [10.3.116.93]) by smtp.corp.redhat.com (Postfix) with ESMTP id B8B5B60BE1 for ; Thu, 8 Aug 2019 14:34:00 +0000 (UTC) From: Eric Blake To: libvir-list@redhat.com Date: Thu, 8 Aug 2019 09:34:00 -0500 Message-Id: <20190808143400.8224-1-eblake@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12 X-loop: libvir-list@redhat.com Subject: [libvirt] [PATCH] ci: Comment tweaks in Makefile.ci X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.12 Precedence: junk List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Content-Transfer-Encoding: quoted-printable Sender: libvir-list-bounces@redhat.com Errors-To: libvir-list-bounces@redhat.com X-Scanned-By: MIMEDefang 2.79 on 10.5.11.11 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.29]); Thu, 08 Aug 2019 14:34:05 +0000 (UTC) Content-Type: text/plain; charset="utf-8" Fix some typos and grammar (calling something safer and error-prone is odd, and 'ther eneeds' is an obvious typo), and reflow some long lines. Signed-off-by: Eric Blake --- Makefile.ci | 38 +++++++++++++++++++++----------------- 1 file changed, 21 insertions(+), 17 deletions(-) diff --git a/Makefile.ci b/Makefile.ci index 8857c953b2..df2195ea72 100644 --- a/Makefile.ci +++ b/Makefile.ci @@ -86,7 +86,7 @@ endif # is liable to mess with SELinux labelling which will # then prevent the host accessing them. And podman cannot # relabel the files due to it running rootless. So -# copying them first is safer and error-prone. +# copying them first is safer and less error-prone. CI_PWDB_MOUNTS =3D \ --volume $(CI_SCRATCHDIR)/group:/etc/group:ro,z \ --volume $(CI_SCRATCHDIR)/passwd:/etc/passwd:ro,z \ @@ -98,22 +98,26 @@ CI_PWDB_MOUNTS =3D \ CI_ULIMIT_FILES =3D 1024 ifeq ($(CI_ENGINE),podman) - # Podman cannot reuse host namespace when running non-root containers. U= ntil - # support for --keep-uid is added we can just create another mapping that= will - # do that for us. Beware, that in {uid,git}map=3Dcontainer_id:host_id:ra= nge, - # the host_id does actually refer to the uid in the first mapping where 0 - # (root) is mapped to the current user and rest is offset. - - # In order to set up this mapping, we need to keep all the user IDs to pr= event - # possible errors as some images might expect UIDs up to 90000 (looking a= t you - # fedora), so we don't want the overflowuid to be used for them. For map= ping - # all the other users properly ther eneeds to be some math done. Don't w= orry, - # it's just addition and subtraction. - - # 65536 ought to be enough (tm), but for really rare cases the maximums m= ight - # need to be higher, but that only happens when your /etc/sub{u,g}id allow - # users to have more IDs. Unless --keep-uid is supported, let's do this = in a - # way that should work for everyone. + # Podman cannot reuse host namespace when running non-root + # containers. Until support for --keep-uid is added we can + # just create another mapping that will do that for us. + # Beware, that in {uid,git}map=3Dcontainer_id:host_id:range, the + # host_id does actually refer to the uid in the first mapping + # where 0 (root) is mapped to the current user and rest is + # offset. + # + # In order to set up this mapping, we need to keep all the + # user IDs to prevent possible errors as some images might + # expect UIDs up to 90000 (looking at you fedora), so we don't + # want the overflowuid to be used for them. For mapping all + # the other users properly, some math needs to be done. + # Don't worry, it's just addition and subtraction. + # + # 65536 ought to be enough (tm), but for really rare cases the + # maximums might need to be higher, but that only happens when + # your /etc/sub{u,g}id allow users to have more IDs. Unless + # --keep-uid is supported, let's do this in a way that should + # work for everyone. CI_MAX_UID =3D $(shell sed -n "s/^$USER:[^:]\+://p" /etc/subuid) CI_MAX_GID =3D $(shell sed -n "s/^$USER:[^:]\+://p" /etc/subgid) ifeq ($(CI_MAX_UID),) --=20 2.20.1 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list