mkimage: Fix Debian security presence check
authorMattias Jernberg <nostrad@gmail.com>
Wed, 5 Dec 2018 18:35:17 +0000 (19:35 +0100)
committerFelix Geyer <fgeyer@debian.org>
Sun, 14 Jun 2020 20:12:29 +0000 (21:12 +0100)
Add Location following since security redirects to security-cdn and caused the repository to be added on Debian unstable.

Signed-off-by: Mattias Jernberg <nostrad@gmail.com>
Origin: upstream, https://github.com/docker/engine/commit/8db5403

Gbp-Pq: Name engine-contrib-debootstrap-curl-follow-location.patch

engine/contrib/mkimage/debootstrap

index 9f7d8987ad2a0db56ee2235ed11e0d5229cd8e71..a919429b0bdea1eca1d879ee122094994f5533e1 100755 (executable)
@@ -193,7 +193,7 @@ if [ -z "$DONT_TOUCH_SOURCES_LIST" ]; then
        case "$lsbDist" in
                debian)
                        # updates and security!
-                       if curl -o /dev/null -s --head --fail "http://security.debian.org/dists/$suite/updates/main/binary-$(rootfs_chroot dpkg --print-architecture)/Packages.gz"; then
+                       if curl -o /dev/null -s --head --location --fail "http://security.debian.org/dists/$suite/updates/main/binary-$(rootfs_chroot dpkg --print-architecture)/Packages.gz"; then
                                (
                                        set -x
                                        sed -i "