From ddcb538720cb193363b5880fae3404caa059cb5e Mon Sep 17 00:00:00 2001
From: wanghuaz <wanghuaz@8638fb3e-16cb-4fca-ae20-7b5d299a9bcd>
Date: Tue, 22 Jan 2013 00:37:38 +0000
Subject: [PATCH] hpc integration is replacing by kit.  so the duplicated
 setting in xcat-server such as /etc/fstab generation should be enabled after
 hpc integration is used.

git-svn-id: https://svn.code.sf.net/p/xcat/code/xcat-core/trunk@14937 8638fb3e-16cb-4fca-ae20-7b5d299a9bcd
---
 .../netboot/rh/compute.rhels6.ppc64.postinstall | 17 +++++++++--------
 .../rh/compute.rhels6.x86_64.postinstall        | 16 ++++++++--------
 2 files changed, 17 insertions(+), 16 deletions(-)

diff --git a/xCAT-server/share/xcat/netboot/rh/compute.rhels6.ppc64.postinstall b/xCAT-server/share/xcat/netboot/rh/compute.rhels6.ppc64.postinstall
index 5fbd8e26a..ad071c87c 100755
--- a/xCAT-server/share/xcat/netboot/rh/compute.rhels6.ppc64.postinstall
+++ b/xCAT-server/share/xcat/netboot/rh/compute.rhels6.ppc64.postinstall
@@ -21,14 +21,15 @@ profile=$4
 workdir=$5
 
 #-- Example how /etc/fstab can be automatically generated during image generation:
-#cat <<END >$installroot/etc/fstab
-#proc            /proc    proc   rw 0 0
-#sysfs           /sys     sysfs  rw 0 0
-#devpts          /dev/pts devpts rw,gid=5,mode=620 0 0
-#${profile}_${arch}      /        tmpfs  rw 0 1
-#none            /tmp     tmpfs  defaults,size=10m 0 2
-#none            /var/tmp tmpfs  defaults,size=10m 0 2
-#END
+cat <<END >$installroot/etc/fstab
+proc            /proc    proc   rw 0 0
+sysfs           /sys     sysfs  rw 0 0
+devpts          /dev/pts devpts rw,gid=5,mode=620 0 0
+${profile}_${arch}      /        tmpfs  rw 0 1
+none            /tmp     tmpfs  defaults,size=10m 0 2
+none            /var/tmp tmpfs  defaults,size=10m 0 2
+END
+
 
 #-- Uncomment the line contains "cons" in /etc/inittab
 #cons:12345:respawn:/sbin/smart_agetty -L 38400 console
diff --git a/xCAT-server/share/xcat/netboot/rh/compute.rhels6.x86_64.postinstall b/xCAT-server/share/xcat/netboot/rh/compute.rhels6.x86_64.postinstall
index c2abfa6b5..f157e7421 100644
--- a/xCAT-server/share/xcat/netboot/rh/compute.rhels6.x86_64.postinstall
+++ b/xCAT-server/share/xcat/netboot/rh/compute.rhels6.x86_64.postinstall
@@ -21,14 +21,14 @@ profile=$4
 workdir=$5
 
 #-- Example how /etc/fstab can be automatically generated during image generation:
-#cat <<END >$installroot/etc/fstab
-#proc            /proc    proc   rw 0 0
-#sysfs           /sys     sysfs  rw 0 0
-#devpts          /dev/pts devpts rw,gid=5,mode=620 0 0
-#${profile}_${arch}      /        tmpfs  rw 0 1
-#none            /tmp     tmpfs  defaults,size=10m 0 2
-#none            /var/tmp tmpfs  defaults,size=10m 0 2
-#END
+cat <<END >$installroot/etc/fstab
+proc            /proc    proc   rw 0 0
+sysfs           /sys     sysfs  rw 0 0
+devpts          /dev/pts devpts rw,gid=5,mode=620 0 0
+${profile}_${arch}      /        tmpfs  rw 0 1
+none            /tmp     tmpfs  defaults,size=10m 0 2
+none            /var/tmp tmpfs  defaults,size=10m 0 2
+END
 
 #-- Uncomment the line contains "cons" in /etc/inittab
 #cons:12345:respawn:/sbin/smart_agetty -L 38400 console