On Thu, 2014-02-06 at 09:10 -0500, Samantha N. Bueno wrote:
Without the appropriate kernel params, booting after installing with
btrfs as the partitioning scheme is not possible.
Resolves: rhbz#874622
---
pyanaconda/bootloader.py | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/pyanaconda/bootloader.py b/pyanaconda/bootloader.py
index eea75ab..778a655 100644
--- a/pyanaconda/bootloader.py
+++ b/pyanaconda/bootloader.py
@@ -2043,9 +2043,9 @@ class ZIPL(BootLoader):
@property
def stage2_format_types(self):
if productName.startswith("Red Hat "):
- return ["xfs", "ext4", "ext3",
"ext2"]
+ return ["xfs", "ext4", "ext3",
"ext2", "btrfs"]
else:
- return ["ext4", "ext3", "ext2",
"xfs"]
+ return ["ext4", "ext3", "ext2",
"btrfs", "xfs"]
image_label_attr = "short_label"
preserve_args = ["cio_ignore"]
Is the above necessary? You're basically enabling /boot-on-btrfs here
for s390.
@@ -2072,6 +2072,8 @@ class ZIPL(BootLoader):
initrd_line = ""
args.add("root=%s" % image.device.fstabSpec)
args.update(self.boot_args)
+ if image.device.type == "btrfs subvolume":
+ args.update(["rootflags=subvol=%s" % image.device.name])
log.info("bootloader.py: used boot args: %s " % args)
stanza = ("[%(label)s]\n"
"\timage=%(boot_dir)s/%(kernel)s\n"
This part looks right.