From: Fabio Erculiani <lxnay@sabayon.org>
Date: Tue, 4 Jan 2011 22:24:35 +0000 (+0100)
Subject: Add minimal btrfs support, as per bug #303529.
X-Git-Tag: v3.4.11~8
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=b6b3dab7cda3a3ba5715124e37ecf06df84cc059;p=genkernel.git

Add minimal btrfs support, as per bug #303529.

RAID0 btrfs volumes can be detected only if btrfsctl is started.
Since embedding extra executables in initramfs is already possible,
add minimal btrfs support inside linuxrc.
---

diff --git a/defaults/initrd.scripts b/defaults/initrd.scripts
index d1f105f..2d5fb5d 100755
--- a/defaults/initrd.scripts
+++ b/defaults/initrd.scripts
@@ -955,6 +955,11 @@ cdupdate() {
 	fi
 }
 
+setup_btrfsctl() {
+	# start BTRFS volume detection, if available
+	[ -x /sbin/btrfsctl ] && /sbin/btrfsctl -a
+}
+
 setup_md_device() {
 	local device
 
diff --git a/defaults/linuxrc b/defaults/linuxrc
index e059314..17a2f47 100755
--- a/defaults/linuxrc
+++ b/defaults/linuxrc
@@ -304,6 +304,9 @@ startiscsi
 # let iscsid settle - otherwise mounting the iSCSI-disk will fail (very rarely, though)
 sleep 1
 
+# Setup btrfs, see bug 303529
+setup_btrfsctl
+
 # Setup md device nodes if they dont exist
 setup_md_device