diff --git a/xCAT-server/share/xcat/install/rh/compute.rhels6.tmpl b/xCAT-server/share/xcat/install/rh/compute.rhels6.tmpl
index e1d433b08..60f4285cc 100644
--- a/xCAT-server/share/xcat/install/rh/compute.rhels6.tmpl
+++ b/xCAT-server/share/xcat/install/rh/compute.rhels6.tmpl
@@ -33,8 +33,9 @@ key --skip
 #No RAID
 #/boot really significant for this sort of setup nowadays?
 #part /boot --size 50 --fstype ext3
-part swap --size 1024 
-part / --size 1 --grow --fstype ext4
+%include /tmp/partitioning
+#part swap --size 1024 
+#part / --size 1 --grow --fstype ext4
 
 #RAID 0 /scr for performance
 #part / --size 1024 --ondisk sda
diff --git a/xCAT-server/share/xcat/install/rh/compute_ad.rhels6.tmpl b/xCAT-server/share/xcat/install/rh/compute_ad.rhels6.tmpl
index 2a37d3eb4..db545d592 100644
--- a/xCAT-server/share/xcat/install/rh/compute_ad.rhels6.tmpl
+++ b/xCAT-server/share/xcat/install/rh/compute_ad.rhels6.tmpl
@@ -33,8 +33,9 @@ key --skip
 #No RAID
 #/boot really significant for this sort of setup nowadays?
 #part /boot --size 50 --fstype ext3
-part swap --size 1024 
-part / --size 1 --grow --fstype ext4
+%include /tmp/partitioning
+#part swap --size 1024 
+#part / --size 1 --grow --fstype ext4
 
 #RAID 0 /scr for performance
 #part / --size 1024 --ondisk sda
diff --git a/xCAT-server/share/xcat/install/rh/hpc.rhels6.tmpl b/xCAT-server/share/xcat/install/rh/hpc.rhels6.tmpl
index e1d433b08..60f4285cc 100644
--- a/xCAT-server/share/xcat/install/rh/hpc.rhels6.tmpl
+++ b/xCAT-server/share/xcat/install/rh/hpc.rhels6.tmpl
@@ -33,8 +33,9 @@ key --skip
 #No RAID
 #/boot really significant for this sort of setup nowadays?
 #part /boot --size 50 --fstype ext3
-part swap --size 1024 
-part / --size 1 --grow --fstype ext4
+%include /tmp/partitioning
+#part swap --size 1024 
+#part / --size 1 --grow --fstype ext4
 
 #RAID 0 /scr for performance
 #part / --size 1024 --ondisk sda
diff --git a/xCAT-server/share/xcat/install/rh/kvm.rhels6.tmpl b/xCAT-server/share/xcat/install/rh/kvm.rhels6.tmpl
index e1d433b08..60f4285cc 100644
--- a/xCAT-server/share/xcat/install/rh/kvm.rhels6.tmpl
+++ b/xCAT-server/share/xcat/install/rh/kvm.rhels6.tmpl
@@ -33,8 +33,9 @@ key --skip
 #No RAID
 #/boot really significant for this sort of setup nowadays?
 #part /boot --size 50 --fstype ext3
-part swap --size 1024 
-part / --size 1 --grow --fstype ext4
+%include /tmp/partitioning
+#part swap --size 1024 
+#part / --size 1 --grow --fstype ext4
 
 #RAID 0 /scr for performance
 #part / --size 1024 --ondisk sda
diff --git a/xCAT-server/share/xcat/install/scripts/pre.rh b/xCAT-server/share/xcat/install/scripts/pre.rh
index 81a6f9a1c..ceb74c7db 100644
--- a/xCAT-server/share/xcat/install/scripts/pre.rh
+++ b/xCAT-server/share/xcat/install/scripts/pre.rh
@@ -121,3 +121,21 @@ EOF
 chmod 755 /tmp/foo.py
 
 /tmp/foo.py >/foo.log 2>&1 &
+#time to ascertain fstype and PReP/UEFI/legacy
+if grep ext4dev /proc/filesystems > /dev/null; then
+	FSTYPE=ext3
+elif grep ext4 /proc/filesystems > /dev/null; then
+	FSTYPE=ext4
+else
+	FSTYPE=ext3
+fi
+if [ `uname -m` = "ppc64" ]; then
+	echo 'part None --fstype "PPC PReP Boot" --size 8' >> /tmp/partitioning 
+fi
+if [ -d /sys/firmware/efi ]; then 
+	echo 'part /boot/efi --size 50 --fstype vfat' >> /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 swap --size 1024" >> /tmp/partitioning
+echo "part / --size 1 --grow --fstype $FSTYPE" >> /tmp/partitioning
+