From cfbd30bf98737239f47e293bd4de497c3bb84820 Mon Sep 17 00:00:00 2001 From: Jarrod Johnson Date: Mon, 2 Jun 2014 13:33:57 -0400 Subject: [PATCH] Update auto-partitioning for RHEL7 In RHEL7, the preferred filesystem is now xfs and the efi partition type is unambiguously present. --- xCAT-server/share/xcat/install/scripts/pre.rh | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/xCAT-server/share/xcat/install/scripts/pre.rh b/xCAT-server/share/xcat/install/scripts/pre.rh index 346b6de73..c5be7d407 100644 --- a/xCAT-server/share/xcat/install/scripts/pre.rh +++ b/xCAT-server/share/xcat/install/scripts/pre.rh @@ -225,19 +225,26 @@ elif grep ext4 /proc/filesystems > /dev/null; then else FSTYPE=ext3 fi +BOOTFSTYPE=ext3 +EFIFSTYPE=vfat +if uname -r|grep ^3.*el7 > /dev/null; then + FSTYPE=xfs + BOOTFSTYPE=xfs + EFIFSTYPE=efi +fi if [ `uname -m` = "ppc64" ]; then echo 'part None --fstype "PPC PReP Boot" --ondisk '$instdisk' --size 8' >> /tmp/partitioning fi if [ -d /sys/firmware/efi ]; then echo 'bootloader --driveorder='$instdisk >> /tmp/partitioning - echo 'part /boot/efi --size 50 --ondisk '$instdisk' --fstype vfat' >> /tmp/partitioning + echo 'part /boot/efi --size 50 --ondisk '$instdisk' --fstype $EFIFSTYPE' >> /tmp/partitioning else echo 'bootloader' >> /tmp/partitioning fi #TODO: ondisk detection, /dev/disk/by-id/edd-int13_dev80 for legacy maybe, and no idea about efi. at least maybe blacklist SAN if mptsas/mpt2sas/megaraid_sas seen... -echo "part /boot --size 256 --fstype ext3 --ondisk $instdisk" >> /tmp/partitioning +echo "part /boot --size 256 --fstype $BOOTFSTYPE --ondisk $instdisk" >> /tmp/partitioning echo "part swap --recommended --ondisk $instdisk" >> /tmp/partitioning echo "part / --size 1 --grow --ondisk $instdisk --fstype $FSTYPE" >> /tmp/partitioning