From: Karel Kočí <redacted>
Date: Mon, 9 Mar 2020 13:59:29 +0000 (+0100)
Subject: btrfs-progs: fix check for btrfs in btrfs scan
X-Git-Url: http://git.99rst.org/?a=commitdiff_plain;h=3e2995aff2f0f4cb8bb5d8a91be27e8d7cb321ea;p=openwrt-packages.git

btrfs-progs: fix check for btrfs in btrfs scan

The previous implementation always succeeded so no scan was performed.
This now fixes that and it correctly scans for BTRFS  devices if BTRFS
support is in kernel.

Signed-off-by: Karel Kočí <redacted>
---

diff --git a/utils/btrfs-progs/Makefile b/utils/btrfs-progs/Makefile
index 6a8431fd2..bea3d033e 100644
--- a/utils/btrfs-progs/Makefile
+++ b/utils/btrfs-progs/Makefile
@@ -7,7 +7,7 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=btrfs-progs
 PKG_VERSION:=5.4.1
-PKG_RELEASE:=2
+PKG_RELEASE:=3
 
 PKG_SOURCE:=$(PKG_NAME)-v$(PKG_VERSION).tar.xz
 PKG_SOURCE_URL:=@KERNEL/linux/kernel/people/kdave/btrfs-progs
diff --git a/utils/btrfs-progs/files/btrfs-scan.init b/utils/btrfs-progs/files/btrfs-scan.init
index 608d3d6c5..6b9ab62df 100644
--- a/utils/btrfs-progs/files/btrfs-scan.init
+++ b/utils/btrfs-progs/files/btrfs-scan.init
@@ -1,7 +1,9 @@
 #!/bin/sh
 
 preinit_btrfs_scan() {
-	grep -vq btrfs /proc/filesystems || btrfs device scan
+	if grep -q btrfs /proc/filesystems; then
+		 btrfs device scan
+	fi
 }
 
 boot_hook_add preinit_main preinit_btrfs_scan