.gitlab-ci.yml: register binfmt handlers only if missing

Signed-off-by: Alexander Sosedkin <asosedkin@redhat.com>

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index b6b560e345f68e595f8803e8a9c6a43c59d94d35..1c21c07be9a84bc8a14bcaeb51a6a48c18bc467e 100644 (file)
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -628,8 +628,7 @@ fedora-cross/bootstrap:
     - host=$(echo $CI_JOB_NAME |cut -d/ -f2)
     - arch=$(echo $host |cut -d- -f1)
     - mount -t binfmt_misc binfmt_misc /proc/sys/fs/binfmt_misc
-    - echo -1 > /proc/sys/fs/binfmt_misc/qemu-$arch
-    - cat /usr/lib/binfmt.d/qemu-$arch-static.conf > /proc/sys/fs/binfmt_misc/register
+    - "[ -e /proc/sys/fs/binfmt_misc/qemu-$arch ] || cat /usr/lib/binfmt.d/qemu-$arch-static.conf > /proc/sys/fs/binfmt_misc/register"
     - make pic-check
     - make -j$BUILDJOBS -C tests check
   tags:
@@ -759,7 +758,7 @@ debian/test:
     - .build
   script:
     - mount -t binfmt_misc binfmt_misc /proc/sys/fs/binfmt_misc
-    - echo ':DOSWin:M::MZ::/usr/bin/wine:' > /proc/sys/fs/binfmt_misc/register
+    - "[ -e /proc/sys/fs/binfmt_misc/DOSWin ] || echo ':DOSWin:M::MZ::/usr/bin/wine:' > /proc/sys/fs/binfmt_misc/register"
     - mingw${arch_bits}-configure --disable-gcc-warnings --host=${arch_name}-w64-mingw32 --target=${arch_name}-w64-mingw32 --cache-file $CCACHE_FILE --disable-nls --with-included-unistring --disable-non-suiteb-curves --disable-full-test-suite --disable-doc --with-pkcs12-iter-count=10000
     - mingw${arch_bits}-make -j$BUILDJOBS
     - mingw${arch_bits}-make -j$BUILDJOBS -C tests check TESTS=""
@@ -769,7 +768,7 @@ debian/test:
     - .test
   before_script:
     - mount -t binfmt_misc binfmt_misc /proc/sys/fs/binfmt_misc
-    - echo ':DOSWin:M::MZ::/usr/bin/wine:' > /proc/sys/fs/binfmt_misc/register
+    - "[ -e /proc/sys/fs/binfmt_misc/DOSWin ] || echo ':DOSWin:M::MZ::/usr/bin/wine:' > /proc/sys/fs/binfmt_misc/register"
   script:
     - mingw${arch_bits}-make -j$CHECKJOBS -C tests check
   timeout: 3h