aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFabio Erculiani <lxnay@sabayon.org>2011-01-04 23:24:35 +0100
committerSebastian Pipping <sebastian@pipping.org>2011-01-05 15:10:37 +0100
commitf2534ee4d5c0d9ac7eaaf3fab18f4f9b6529d9d2 (patch)
treec2893b0ffac8e7b4d8891d852cac83225c5e0d9f
parentAdd compatibility with older cmdline setup on console argument (diff)
downloadgenkernel-f2534ee4d5c0d9ac7eaaf3fab18f4f9b6529d9d2.tar.gz
genkernel-f2534ee4d5c0d9ac7eaaf3fab18f4f9b6529d9d2.tar.bz2
genkernel-f2534ee4d5c0d9ac7eaaf3fab18f4f9b6529d9d2.zip
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.
-rwxr-xr-xdefaults/initrd.scripts5
-rwxr-xr-xdefaults/linuxrc3
2 files changed, 8 insertions, 0 deletions
diff --git a/defaults/initrd.scripts b/defaults/initrd.scripts
index fe9fdd1..3cc1de8 100755
--- a/defaults/initrd.scripts
+++ b/defaults/initrd.scripts
@@ -920,6 +920,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 7d5f634..3cc1ca2 100755
--- a/defaults/linuxrc
+++ b/defaults/linuxrc
@@ -299,6 +299,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