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-15 18:04:17 +0100
commitb6b3dab7cda3a3ba5715124e37ecf06df84cc059 (patch)
tree564c70ea861834008bd56bd98d737d9af756d729 /defaults
parentAdd LABEL support to crypt_root, clean up UUID crypt_root patch (diff)
downloadgenkernel-b6b3dab7cda3a3ba5715124e37ecf06df84cc059.tar.gz
genkernel-b6b3dab7cda3a3ba5715124e37ecf06df84cc059.tar.bz2
genkernel-b6b3dab7cda3a3ba5715124e37ecf06df84cc059.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.
Diffstat (limited to 'defaults')
-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 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