[Debian-ha-maintainers] Bug#867363: d/t/basic: do not assume local filesystem size supports ocfs2 blocksize

[Nishanth Aravamudan]

Package: ocfs2-tools
Version: 1.8.5-1
Severity: normal
Tags: patch
User: ubuntu-devel at lists.ubuntu.com
Usertags: origin-ubuntu artful ubuntu-patch

Dear Maintainer,

In Ubuntu, the attached patch was applied to achieve the following:

    - d/t/basic: do not assume local filesystem blocksize will support
      the mkfs.ocfs2 blocksize (e.g., 4k disks will not support a 1k
      blocksize).

Thanks for considering the patch.

*** /tmp/tmpUzk4dx/ocfs2-tools_1.8.5-1ubuntu1.debdiff
diff -Nru ocfs2-tools-1.8.5/debian/tests/basic ocfs2-tools-1.8.5/debian/tests/basic
--- ocfs2-tools-1.8.5/debian/tests/basic	2016-10-21 09:24:13.000000000 -0700
+++ ocfs2-tools-1.8.5/debian/tests/basic	2017-07-05 17:21:52.000000000 -0700
@@ -16,7 +16,7 @@
 
 # test tools
 echo "=== mkfs ==="
-mkfs.ocfs2 --force --mount local $DISK 2>&1
+mkfs.ocfs2 --force --mount local --block-size $(stat -f $DISK --format='%s') $DISK 2>&1
 
 echo "=== fsck ==="
 yes | fsck.ocfs2 -f -y -F $DISK 2>&1


-- System Information:
Debian Release: stretch/sid
  APT prefers artful
  APT policy: (500, 'artful')
Architecture: amd64 (x86_64)
Foreign Architectures: i386

Kernel: Linux 4.10.0-24-generic (SMP w/4 CPU cores)
Locale: LANG=en_US.UTF-8, LC_CTYPE=en_US.UTF-8 (charmap=UTF-8), LANGUAGE=en_US:en (charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash
Init: systemd (via /run/systemd/system)

-- 
Nishanth Aravamudan
Ubuntu Server
Canonical Ltd