From 62f7e0621aec57f8f9f5f5facd8fbb3f69f5c8e5 Mon Sep 17 00:00:00 2001
From: Laszlo Gombos <laszlo.gombos@gmail.com>
Date: Sat, 12 Nov 2022 01:06:50 +0000
Subject: [PATCH] ci: add mkfs.ntfs and ntfs-3g to test containers

ntfs-3g is needed to test dmsquash-live-ntfs
---
 test/container/Dockerfile-Arch            | 2 +-
 test/container/Dockerfile-Debian          | 1 +
 test/container/Dockerfile-Fedora-latest   | 1 +
 test/container/Dockerfile-Gentoo          | 1 +
 test/container/Dockerfile-OpenSuse-latest | 2 +-
 5 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/test/container/Dockerfile-Arch b/test/container/Dockerfile-Arch
index 3529b9a130..fccc334442 100644
--- a/test/container/Dockerfile-Arch
+++ b/test/container/Dockerfile-Arch
@@ -12,7 +12,7 @@ RUN pacman --noconfirm -Syu \
     linux dash strace dhclient asciidoc cpio pigz squashfs-tools \
     qemu btrfs-progs mdadm dmraid nfs-utils nfsidmap lvm2 nbd \
     dhcp networkmanager multipath-tools vi tcpdump open-iscsi \
-    git shfmt shellcheck astyle which base-devel glibc parted && yes | pacman -Scc
+    git shfmt shellcheck astyle which base-devel glibc parted ntfs-3g && yes | pacman -Scc
 
 RUN useradd -m build
 RUN su build -c 'cd && git clone https://aur.archlinux.org/perl-config-general.git && cd perl-config-general && makepkg -s --noconfirm'
diff --git a/test/container/Dockerfile-Debian b/test/container/Dockerfile-Debian
index 1386d03bb2..a2fb1657d8 100644
--- a/test/container/Dockerfile-Debian
+++ b/test/container/Dockerfile-Debian
@@ -43,6 +43,7 @@ RUN apt-get update -y -qq && apt-get upgrade -y -qq && DEBIAN_FRONTEND=nonintera
     nbd-client \
     network-manager \
     nfs-kernel-server \
+    ntfs-3g \
     open-iscsi \
     parted \
     pigz \
diff --git a/test/container/Dockerfile-Fedora-latest b/test/container/Dockerfile-Fedora-latest
index a38a72efd9..ef29a3ffa5 100644
--- a/test/container/Dockerfile-Fedora-latest
+++ b/test/container/Dockerfile-Fedora-latest
@@ -50,6 +50,7 @@ RUN dnf -y install --setopt=install_weak_deps=False \
     ShellCheck \
     shfmt \
     parted \
+    ntfsprogs \
     && dnf -y update && dnf clean all
 
 # Set default command
diff --git a/test/container/Dockerfile-Gentoo b/test/container/Dockerfile-Gentoo
index 2c741064b3..deee15f67d 100644
--- a/test/container/Dockerfile-Gentoo
+++ b/test/container/Dockerfile-Gentoo
@@ -29,6 +29,7 @@ RUN emerge -qv \
     sys-block/parted \
     sys-fs/btrfs-progs \
     sys-fs/lvm2 \
+    sys-fs/ntfs3g \
     sys-fs/squashfs-tools \
     && rm -rf /var/cache/* /usr/share/doc/* /usr/share/man/* /var/db/repos/gentoo
 
diff --git a/test/container/Dockerfile-OpenSuse-latest b/test/container/Dockerfile-OpenSuse-latest
index 9aaf07b192..3b396a7b1c 100644
--- a/test/container/Dockerfile-OpenSuse-latest
+++ b/test/container/Dockerfile-OpenSuse-latest
@@ -13,7 +13,7 @@ RUN dnf -y install --setopt=install_weak_deps=False \
     strace libkmod-devel gcc bzip2 xz tar wget rpm-build make git bash-completion \
     sudo kernel dhcp-client qemu-kvm /usr/bin/qemu-system-$(uname -m) e2fsprogs \
     tcpdump iproute iputils kbd NetworkManager btrfsprogs tgt dbus-broker \
-    iscsiuio open-iscsi which ShellCheck procps pigz parted squashfs \
+    iscsiuio open-iscsi which ShellCheck procps pigz parted squashfs ntfsprogs \
     && dnf -y update && dnf clean all
 
 RUN shfmt_version=3.2.4; wget "https://github.com/mvdan/sh/releases/download/v${shfmt_version}/shfmt_v${shfmt_version}_linux_amd64" -O /usr/local/bin/shfmt \