From: Andrea Bolognani <abologna@redhat.com>
Date: Thu, 15 Aug 2019 16:41:05 +0000 (+0200)
Subject: ci: Fix /etc/sub{u,g}id parsing
X-Git-Tag: v5.7.0-rc1~137
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=114b2443b50ac356e0a7bcaba75fe9cb506cf24f;p=thirdparty%2Flibvirt.git

ci: Fix /etc/sub{u,g}id parsing

The $ needs to be escaped when calling shell code from a
Makefile.

Signed-off-by: Andrea Bolognani <abologna@redhat.com>
Reviewed-by: Ján Tomko <jtomko@redhat.com>
---

diff --git a/Makefile.ci b/Makefile.ci
index 865cba7660..ac859dcb95 100644
--- a/Makefile.ci
+++ b/Makefile.ci
@@ -118,8 +118,8 @@ ifeq ($(CI_ENGINE),podman)
 	# 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 = $(shell sed -n "s/^$USER:[^:]\+://p" /etc/subuid)
-	CI_MAX_GID = $(shell sed -n "s/^$USER:[^:]\+://p" /etc/subgid)
+	CI_MAX_UID = $(shell sed -n "s/^$$USER:[^:]\+://p" /etc/subuid)
+	CI_MAX_GID = $(shell sed -n "s/^$$USER:[^:]\+://p" /etc/subgid)
 	ifeq ($(CI_MAX_UID),)
 		CI_MAX_UID = 65536
 	endif