From 3e2995aff2f0f4cb8bb5d8a91be27e8d7cb321ea Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Karel=20Ko=C4=8D=C3=AD?= Date: Mon, 9 Mar 2020 14:59:29 +0100 Subject: [PATCH] btrfs-progs: fix check for btrfs in btrfs scan MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 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čí --- utils/btrfs-progs/Makefile | 2 +- utils/btrfs-progs/files/btrfs-scan.init | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/utils/btrfs-progs/Makefile b/utils/btrfs-progs/Makefile index 6a8431fd2f..bea3d033ee 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 608d3d6c59..6b9ab62df9 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