Skip to content
Snippets Groups Projects
Verified Commit 7a38c969 authored by Alex Iribarren's avatar Alex Iribarren
Browse files

Add RAID modules to dracut the right way

parent 4eb64cac
No related branches found
No related tags found
1 merge request!41Fix software RAID support
Pipeline #2667249 passed
Stage: validate
    Stage: build
      Stage: test
        Stage: tests
          Stage: publish_test
            Stage: prod
              Hide whitespace changes
              Inline Side-by-side
              c8-cloud.ks
              + 7
              − 3
              View file @ 7a38c969
              ...@@ -185,9 +185,6 @@ rm -f /root/anaconda-{ks,pre,post}.log ...@@ -185,9 +185,6 @@ rm -f /root/anaconda-{ks,pre,post}.log
              rm -f /root/{anaconda,original}-ks.cfg rm -f /root/{anaconda,original}-ks.cfg
              rm -rf /var/cache/dnf/* rm -rf /var/cache/dnf/*
              # Ironic fix for RAID1 at boot time (Disabled for now)
              /usr/bin/dracut -v --add 'mdraid' --add-drivers 'raid1 raid10 raid5 raid0 linear' --regenerate-all --force
              # Ironic fix rd.auto # Ironic fix rd.auto
              sed -i -e 's/crashkernel=auto/rd.auto net.ifnames=0 crashkernel=auto/g' /etc/default/grub sed -i -e 's/crashkernel=auto/rd.auto net.ifnames=0 crashkernel=auto/g' /etc/default/grub
              ...@@ -219,6 +216,13 @@ sed -i '/^### BEGIN \/etc\/grub.d\/30_uefi/,/^### END \/etc\/grub.d\/30_uefi/{/^ ...@@ -219,6 +216,13 @@ sed -i '/^### BEGIN \/etc\/grub.d\/30_uefi/,/^### END \/etc\/grub.d\/30_uefi/{/^
              # Based on https://github.com/CentOS/sig-cloud-instance-build/blob/98aa8c6f0290feeb94d86b52c561d70eabc7d942/cloudimg/CentOS-8-x86_64-Azure.ks#L175-179 # Based on https://github.com/CentOS/sig-cloud-instance-build/blob/98aa8c6f0290feeb94d86b52c561d70eabc7d942/cloudimg/CentOS-8-x86_64-Azure.ks#L175-179
              echo '# Ensure nvme drivers are built into initramfs' >> /etc/dracut.conf.d/nvme.conf echo '# Ensure nvme drivers are built into initramfs' >> /etc/dracut.conf.d/nvme.conf
              echo -e "\nadd_drivers+=\"nvme\"" >> /etc/dracut.conf.d/nvme.conf echo -e "\nadd_drivers+=\"nvme\"" >> /etc/dracut.conf.d/nvme.conf
              # Ensure mdadm is built into initramfs so we can install on software RAID
              echo '# dracut modules to add to the default' >> /etc/dracut.conf.d/mdadm.conf
              echo 'add_dracutmodules+="dm lvm dmraid mdraid"' >> /etc/dracut.conf.d/mdadm.conf
              echo 'add_drivers+="raid1 raid10 raid5 raid0 linear"' >> /etc/dracut.conf.d/mdadm.conf
              # Rebuild the initramfs
              kversion=$( rpm -q kernel | sed 's/kernel\-//' ) kversion=$( rpm -q kernel | sed 's/kernel\-//' )
              dracut -v -f "/boot/initramfs-${kversion}.img" "$kversion" dracut -v -f "/boot/initramfs-${kversion}.img" "$kversion"
              ......
              cs8-cloud.ks
              + 7
              − 3
              View file @ 7a38c969
              ...@@ -185,9 +185,6 @@ rm -f /root/anaconda-{ks,pre,post}.log ...@@ -185,9 +185,6 @@ rm -f /root/anaconda-{ks,pre,post}.log
              rm -f /root/{anaconda,original}-ks.cfg rm -f /root/{anaconda,original}-ks.cfg
              rm -rf /var/cache/dnf/* rm -rf /var/cache/dnf/*
              # Ironic fix for RAID1 at boot time (Disabled for now)
              /usr/bin/dracut -v --add 'mdraid' --add-drivers 'raid1 raid10 raid5 raid0 linear' --regenerate-all --force
              # Ironic fix rd.auto # Ironic fix rd.auto
              sed -i -e 's/crashkernel=auto/rd.auto net.ifnames=0 crashkernel=auto/g' /etc/default/grub sed -i -e 's/crashkernel=auto/rd.auto net.ifnames=0 crashkernel=auto/g' /etc/default/grub
              ...@@ -219,6 +216,13 @@ sed -i '/^### BEGIN \/etc\/grub.d\/30_uefi/,/^### END \/etc\/grub.d\/30_uefi/{/^ ...@@ -219,6 +216,13 @@ sed -i '/^### BEGIN \/etc\/grub.d\/30_uefi/,/^### END \/etc\/grub.d\/30_uefi/{/^
              # Based on https://github.com/CentOS/sig-cloud-instance-build/blob/98aa8c6f0290feeb94d86b52c561d70eabc7d942/cloudimg/CentOS-8-x86_64-Azure.ks#L175-179 # Based on https://github.com/CentOS/sig-cloud-instance-build/blob/98aa8c6f0290feeb94d86b52c561d70eabc7d942/cloudimg/CentOS-8-x86_64-Azure.ks#L175-179
              echo '# Ensure nvme drivers are built into initramfs' >> /etc/dracut.conf.d/nvme.conf echo '# Ensure nvme drivers are built into initramfs' >> /etc/dracut.conf.d/nvme.conf
              echo -e "\nadd_drivers+=\"nvme\"" >> /etc/dracut.conf.d/nvme.conf echo -e "\nadd_drivers+=\"nvme\"" >> /etc/dracut.conf.d/nvme.conf
              # Ensure mdadm is built into initramfs so we can install on software RAID
              echo '# dracut modules to add to the default' >> /etc/dracut.conf.d/mdadm.conf
              echo 'add_dracutmodules+="dm lvm dmraid mdraid"' >> /etc/dracut.conf.d/mdadm.conf
              echo 'add_drivers+="raid1 raid10 raid5 raid0 linear"' >> /etc/dracut.conf.d/mdadm.conf
              # Rebuild the initramfs
              kversion=$( rpm -q kernel | sed 's/kernel\-//' ) kversion=$( rpm -q kernel | sed 's/kernel\-//' )
              dracut -v -f "/boot/initramfs-${kversion}.img" "$kversion" dracut -v -f "/boot/initramfs-${kversion}.img" "$kversion"
              ......
              0% or .
              You are about to add 0 people to the discussion. Proceed with caution.
              Finish editing this message first!
              Please register or to comment