From d4f35031c9c720eb09e18fcdca35db714a613ff5 Mon Sep 17 00:00:00 2001 From: Jarrod Johnson Date: Mon, 2 Jun 2014 13:38:18 -0400 Subject: [PATCH] Apply previous changes to the pre for rhel7 specifically --- xCAT-server/share/xcat/install/scripts/pre.rh.rhel7 | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/xCAT-server/share/xcat/install/scripts/pre.rh.rhel7 b/xCAT-server/share/xcat/install/scripts/pre.rh.rhel7 index 09203dfc6..6d94227d3 100644 --- a/xCAT-server/share/xcat/install/scripts/pre.rh.rhel7 +++ b/xCAT-server/share/xcat/install/scripts/pre.rh.rhel7 @@ -178,8 +178,14 @@ if [ -z "$instdisk" ]; then instdisk=$firstdisk fi fi - +BOOTFSTYPE=ext3 +EFIFSTYPE=vfat +if uname -r|grep ^3.*el7 > /dev/null; then + BOOTFSTYPE=xfs + FSTYPE=xfs + EFIFSTYPE=efi +fi modprobe ext4 >& /dev/null modprobe ext4dev >& /dev/null if grep ext4dev /proc/filesystems > /dev/null; then @@ -194,11 +200,11 @@ 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 'part /boot/efi --size 50 --ondisk '$instdisk' --fstype vfat' >> /tmp/partitioning + echo 'part /boot/efi --size 50 --ondisk '$instdisk' --fstype efi' >> /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