From 91e8bed7a3872e7085297650718f7e2140e2d16b Mon Sep 17 00:00:00 2001
From: Pavel Vondruska <dexter.cz@gmail.com>
Date: Fri, 15 Jul 2022 08:58:07 +0200
Subject: [PATCH] Vyjmuti NFS4 z filesystem_resolver

---
 1001-Exclude_NFS4_from_fileresolver.patch | 16 ++++++++++++++++
 make.sh                                   |  8 ++++----
 2 files changed, 20 insertions(+), 4 deletions(-)
 create mode 100644 1001-Exclude_NFS4_from_fileresolver.patch

diff --git a/1001-Exclude_NFS4_from_fileresolver.patch b/1001-Exclude_NFS4_from_fileresolver.patch
new file mode 100644
index 0000000..055cb29
--- /dev/null
+++ b/1001-Exclude_NFS4_from_fileresolver.patch
@@ -0,0 +1,16 @@
+Index: facter-3.14.12/lib/src/facts/linux/filesystem_resolver.cc
+===================================================================
+--- facter-3.14.12.orig/lib/src/facts/linux/filesystem_resolver.cc
++++ facter-3.14.12/lib/src/facts/linux/filesystem_resolver.cc
+@@ -88,6 +88,11 @@ namespace facter { namespace facts { nam
+                 continue;
+             }
+ 
++            // Skip over NFS4
++            if (mtype == "nfs4") {
++                continue;
++            }
++
+             // If the "root" device, lookup the actual device from the kernel options
+             // This is done because not all systems symlink /dev/root
+             if (device == "/dev/root") {
diff --git a/make.sh b/make.sh
index fd424ee..08a26a7 100755
--- a/make.sh
+++ b/make.sh
@@ -29,13 +29,13 @@ apt update -qqq
 apt install -yqqq git devscripts build-essential
 
 apt source facter
-cp 01-statfs-skip-auto.diff facter-3.14.12/debian/patches
+cp 1001-Exclude_NFS4_from_fileresolver.patch facter-3.14.12/debian/patches
 cd facter-3.14.12
 
-echo '01-statfs-skip-auto.diff' >> debian/patches/series
+echo '1001-Exclude_NFS4_from_fileresolver.patch' >> debian/patches/series
 
-dch --newversion "3.14.12-1+dex1" "[ Dex ]"
-dch --append "Skip /auto from statfs"
+dch -l "+dex" "[ Dex ]"
+dch --append "Skip NFS4 mounts in filesystem_resolver"
 
 mk-build-deps --install --tool='apt-get -o Debug::pkgProblemResolver=yes --yes' debian/control
 
-- 
GitLab