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čí <karel.koci@nic.cz>

diff --git a/utils/btrfs-progs/Makefile b/utils/btrfs-progs/Makefile
index 6a8431fd2fba2d2f3a3327c6df48188e20a5bd5b..bea3d033ee84bd97dc75f5da093d23029c78ae9d 100644 (file)
--- 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 608d3d6c59b0c861debbb049e515e84f69ba6692..6b9ab62df9c05addc0d8aad08886ac30fbc2e7ce 100644 (file)
--- 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