From e19bdb11814cc9d72751b6130ec7fb072f1b9983 Mon Sep 17 00:00:00 2001 From: wanghuaz Date: Tue, 22 Jan 2013 00:36:15 +0000 Subject: [PATCH] hpc integration is replacing by kit. so the duplicated setting in xcat-server should be enabled after hpc integration is used. git-svn-id: https://svn.code.sf.net/p/xcat/code/xcat-core/trunk@14936 8638fb3e-16cb-4fca-ae20-7b5d299a9bcd --- .../share/xcat/netboot/sles/compute.postinstall | 16 ++++++++-------- .../xcat/netboot/sles/compute.sles11.postinstall | 16 ++++++++-------- 2 files changed, 16 insertions(+), 16 deletions(-) diff --git a/xCAT-server/share/xcat/netboot/sles/compute.postinstall b/xCAT-server/share/xcat/netboot/sles/compute.postinstall index 74f99e350..734a63487 100755 --- a/xCAT-server/share/xcat/netboot/sles/compute.postinstall +++ b/xCAT-server/share/xcat/netboot/sles/compute.postinstall @@ -21,14 +21,14 @@ profile=$4 workdir=$5 #-- Example how /etc/fstab can be automatically generated during image generation: -#cat <$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 <$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 #-- Example of booted image versioning #-- We want to know, with what configuration (version of the image) each node was booted. diff --git a/xCAT-server/share/xcat/netboot/sles/compute.sles11.postinstall b/xCAT-server/share/xcat/netboot/sles/compute.sles11.postinstall index d97553030..c75134560 100755 --- a/xCAT-server/share/xcat/netboot/sles/compute.sles11.postinstall +++ b/xCAT-server/share/xcat/netboot/sles/compute.sles11.postinstall @@ -21,14 +21,14 @@ profile=$4 workdir=$5 #-- Example how /etc/fstab can be automatically generated during image generation: -#cat <$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 <$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