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 d1f105f1217be5ac1b765bd07569d7ee4e60f0e7..2d5fb5d1a3365262b4a490c40fd5e0749e37287c 100755 (executable)
--- 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 e059314d7cb1035b8f1c6517a03096985d836dea..17a2f475295d3f58f01f5b33780190849ba9d7b1 100755 (executable)
--- 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