]> git.ipfire.org Git - thirdparty/libvirt.git/commitdiff
ci: Fix /etc/sub{u,g}id parsing
authorAndrea Bolognani <abologna@redhat.com>
Thu, 15 Aug 2019 16:41:05 +0000 (18:41 +0200)
committerAndrea Bolognani <abologna@redhat.com>
Wed, 21 Aug 2019 16:57:56 +0000 (18:57 +0200)
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>
Makefile.ci

index 865cba7660fca1bc3853308ec3cd2d0b47feec49..ac859dcb9567a94c44a697b5da1c7a1c8ba9294f 100644 (file)
@@ -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