From 013a4a69241c693d6b165b1ccef336de4a161881 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?V=C3=ADt=20Ondruch?= Date: Thu, 14 Dec 2023 15:17:24 +0100 Subject: [PATCH] Report file system type Previously, only the file sizes were reported: ~~~ Filesystem Size Used Avail Use% Mounted on /dev/mapper/luks-3aa4fbe3-5a19-4025-b70c-1d3038b76bd4 399G 9.1G 373G 3% / /dev/mapper/luks-3aa4fbe3-5a19-4025-b70c-1d3038b76bd4 399G 9.1G 373G 3% / ~~~ Newly, also file system type will be reported: ~~~ Filesystem Type Size Used Avail Use% Mounted on /dev/mapper/luks-3aa4fbe3-5a19-4025-b70c-1d3038b76bd4 btrfs 399G 9.1G 373G 3% / /dev/mapper/luks-3aa4fbe3-5a19-4025-b70c-1d3038b76bd4 btrfs 399G 9.1G 373G 3% / ~~~ This is useful in case file system influeces the build result. Fixes #1263 --- mock/py/mockbuild/plugins/hw_info.py | 2 +- .../report-file-system-type.feature | 15 +++++++++++++++ 2 files changed, 16 insertions(+), 1 deletion(-) create mode 100644 releng/release-notes-next/report-file-system-type.feature diff --git a/mock/py/mockbuild/plugins/hw_info.py b/mock/py/mockbuild/plugins/hw_info.py index 33f0ca4a4..dfd8e401b 100644 --- a/mock/py/mockbuild/plugins/hw_info.py +++ b/mock/py/mockbuild/plugins/hw_info.py @@ -47,7 +47,7 @@ def _unprivPreInitHook(self): out.write("\n\nMemory:\n") out.write(output) - cmd = ["/bin/df", "-H", self.buildroot.make_chroot_path(), self.config["cache_topdir"]] + cmd = ["/bin/df", "-H", "-T", self.buildroot.make_chroot_path(), self.config["cache_topdir"]] output = mockbuild.util.do(cmd, shell=False, returnOutput=True, raiseExc=False) out.write("\n\nStorage (chroot, cache_topdir):\n") out.write(output) diff --git a/releng/release-notes-next/report-file-system-type.feature b/releng/release-notes-next/report-file-system-type.feature new file mode 100644 index 000000000..7d2acfdae --- /dev/null +++ b/releng/release-notes-next/report-file-system-type.feature @@ -0,0 +1,15 @@ +Previously, only the file sizes were reported by the hw_info plugin: + +~~~ +Filesystem Size Used Avail Use% Mounted on +/dev/mapper/luks-3aa4fbe3-5a19-4025-b70c-1d3038b76bd4 399G 9.1G 373G 3% / +/dev/mapper/luks-3aa4fbe3-5a19-4025-b70c-1d3038b76bd4 399G 9.1G 373G 3% / +~~~ + +Newly, also file system type is reported: + +~~~ +Filesystem Type Size Used Avail Use% Mounted on +/dev/mapper/luks-3aa4fbe3-5a19-4025-b70c-1d3038b76bd4 btrfs 399G 9.1G 373G 3% / +/dev/mapper/luks-3aa4fbe3-5a19-4025-b70c-1d3038b76bd4 btrfs 399G 9.1G 373G 3% / +~~~