[master/rhel7-branch] Add correct kernel params if rootfs is btrfs on s390x. (#874622)

Samantha N. Bueno sbueno+anaconda at redhat.com
Thu Feb 6 14:10:49 UTC 2014


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"]
@@ -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"
-- 
1.8.3.1



More information about the anaconda-patches mailing list