From 9015913661f4b8a77d7f71793e48b07e079311ae Mon Sep 17 00:00:00 2001 From: Samveen Gulati Date: Sun, 11 Oct 2015 10:59:48 +0000 Subject: [PATCH 1/2] [xCAT-Server]Fix #253 with minor improvement --- xCAT-server/share/xcat/install/scripts/pre.rh | 2 +- xCAT-server/share/xcat/install/scripts/pre.rh.rhels7 | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/xCAT-server/share/xcat/install/scripts/pre.rh b/xCAT-server/share/xcat/install/scripts/pre.rh index ee85680a1..7117fc832 100644 --- a/xCAT-server/share/xcat/install/scripts/pre.rh +++ b/xCAT-server/share/xcat/install/scripts/pre.rh @@ -237,7 +237,7 @@ else fi BOOTFSTYPE=ext3 EFIFSTYPE=vfat -if uname -r|grep ^3.*el7 > /dev/null; then +if uname -r|grep -q '^3.*el7'; then FSTYPE=xfs BOOTFSTYPE=xfs EFIFSTYPE=efi diff --git a/xCAT-server/share/xcat/install/scripts/pre.rh.rhels7 b/xCAT-server/share/xcat/install/scripts/pre.rh.rhels7 index 94fec22d9..feddc70f2 100755 --- a/xCAT-server/share/xcat/install/scripts/pre.rh.rhels7 +++ b/xCAT-server/share/xcat/install/scripts/pre.rh.rhels7 @@ -200,7 +200,7 @@ fi BOOTFSTYPE=ext3 EFIFSTYPE=vfat -if uname -r|grep '^3.*el7' > /dev/null; then +if uname -r|grep -q '^3.*el7'; then BOOTFSTYPE=xfs FSTYPE=xfs EFIFSTYPE=efi From cf4c91ac69e3b3d0279cd454741c9ece92c7002f Mon Sep 17 00:00:00 2001 From: Samveen Gulati Date: Fri, 16 Oct 2015 09:00:16 +0000 Subject: [PATCH 2/2] [xCAT-Server]Remove el7 specific code from pre.rh --- xCAT-server/share/xcat/install/scripts/pre.rh | 5 ----- 1 file changed, 5 deletions(-) diff --git a/xCAT-server/share/xcat/install/scripts/pre.rh b/xCAT-server/share/xcat/install/scripts/pre.rh index 7117fc832..1254652d0 100644 --- a/xCAT-server/share/xcat/install/scripts/pre.rh +++ b/xCAT-server/share/xcat/install/scripts/pre.rh @@ -237,11 +237,6 @@ else fi BOOTFSTYPE=ext3 EFIFSTYPE=vfat -if uname -r|grep -q '^3.*el7'; 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