From 39fa86cb28f00cd194967c6e3a89df3fcf9d9ef1 Mon Sep 17 00:00:00 2001 From: wanghuaz Date: Fri, 10 Feb 2012 06:29:52 +0000 Subject: [PATCH] backout the commit 11531 and 11532 in 2.6 branch git-svn-id: https://svn.code.sf.net/p/xcat/code/xcat-core/branches/2.6@11534 8638fb3e-16cb-4fca-ae20-7b5d299a9bcd --- xCAT-server/share/xcat/install/rh/compute.rhels6.ppc64.tmpl | 2 +- xCAT-server/share/xcat/install/rh/compute.rhels6.s390x.tmpl | 2 +- xCAT-server/share/xcat/install/rh/compute.rhels6.tmpl | 2 +- xCAT-server/share/xcat/install/rh/compute_ad.rhels6.tmpl | 2 +- xCAT-server/share/xcat/install/rh/hpc.rhels6.tmpl | 2 +- xCAT-server/share/xcat/install/rh/kvm.rhel6.tmpl | 2 +- xCAT-server/share/xcat/install/rh/kvm.rhels6.tmpl | 2 +- .../xcat/install/rh/service.raid1.multipath.rhel6.ppc64.tmpl | 2 +- .../share/xcat/install/rh/service.raid1.rhel6.ppc64.tmpl | 2 +- xCAT-server/share/xcat/install/rh/service.rhels6.ppc64.tmpl | 2 +- 10 files changed, 10 insertions(+), 10 deletions(-) diff --git a/xCAT-server/share/xcat/install/rh/compute.rhels6.ppc64.tmpl b/xCAT-server/share/xcat/install/rh/compute.rhels6.ppc64.tmpl index 408597829..50dc384f1 100644 --- a/xCAT-server/share/xcat/install/rh/compute.rhels6.ppc64.tmpl +++ b/xCAT-server/share/xcat/install/rh/compute.rhels6.ppc64.tmpl @@ -18,7 +18,7 @@ keyboard "us" # # Clear the MBR # -zerombr +zerombr yes # # Wipe out the disk diff --git a/xCAT-server/share/xcat/install/rh/compute.rhels6.s390x.tmpl b/xCAT-server/share/xcat/install/rh/compute.rhels6.s390x.tmpl index 07b63212f..63ea029a6 100644 --- a/xCAT-server/share/xcat/install/rh/compute.rhels6.s390x.tmpl +++ b/xCAT-server/share/xcat/install/rh/compute.rhels6.s390x.tmpl @@ -17,7 +17,7 @@ key --skip # Note that any partitions you deleted are not expressed # here so unless you clear all partitions first, this is # not guaranteed to work -zerombr +zerombr yes clearpart --initlabel --drives=dasda part / --fstype ext3 --size=100 --grow --ondisk=dasda part swap --size=512 --ondisk=dasda diff --git a/xCAT-server/share/xcat/install/rh/compute.rhels6.tmpl b/xCAT-server/share/xcat/install/rh/compute.rhels6.tmpl index 047dc238c..e1d433b08 100644 --- a/xCAT-server/share/xcat/install/rh/compute.rhels6.tmpl +++ b/xCAT-server/share/xcat/install/rh/compute.rhels6.tmpl @@ -17,7 +17,7 @@ keyboard "us" # # Clear the MBR # -zerombr +zerombr yes # # Wipe out the disk 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 3eb2bef53..2a37d3eb4 100644 --- a/xCAT-server/share/xcat/install/rh/compute_ad.rhels6.tmpl +++ b/xCAT-server/share/xcat/install/rh/compute_ad.rhels6.tmpl @@ -17,7 +17,7 @@ keyboard "us" # # Clear the MBR # -zerombr +zerombr yes # # Wipe out the disk diff --git a/xCAT-server/share/xcat/install/rh/hpc.rhels6.tmpl b/xCAT-server/share/xcat/install/rh/hpc.rhels6.tmpl index 047dc238c..e1d433b08 100644 --- a/xCAT-server/share/xcat/install/rh/hpc.rhels6.tmpl +++ b/xCAT-server/share/xcat/install/rh/hpc.rhels6.tmpl @@ -17,7 +17,7 @@ keyboard "us" # # Clear the MBR # -zerombr +zerombr yes # # Wipe out the disk diff --git a/xCAT-server/share/xcat/install/rh/kvm.rhel6.tmpl b/xCAT-server/share/xcat/install/rh/kvm.rhel6.tmpl index 047dc238c..e1d433b08 100644 --- a/xCAT-server/share/xcat/install/rh/kvm.rhel6.tmpl +++ b/xCAT-server/share/xcat/install/rh/kvm.rhel6.tmpl @@ -17,7 +17,7 @@ keyboard "us" # # Clear the MBR # -zerombr +zerombr yes # # Wipe out the disk diff --git a/xCAT-server/share/xcat/install/rh/kvm.rhels6.tmpl b/xCAT-server/share/xcat/install/rh/kvm.rhels6.tmpl index 047dc238c..e1d433b08 100644 --- a/xCAT-server/share/xcat/install/rh/kvm.rhels6.tmpl +++ b/xCAT-server/share/xcat/install/rh/kvm.rhels6.tmpl @@ -17,7 +17,7 @@ keyboard "us" # # Clear the MBR # -zerombr +zerombr yes # # Wipe out the disk diff --git a/xCAT-server/share/xcat/install/rh/service.raid1.multipath.rhel6.ppc64.tmpl b/xCAT-server/share/xcat/install/rh/service.raid1.multipath.rhel6.ppc64.tmpl index a7e674f6e..57adf0afc 100644 --- a/xCAT-server/share/xcat/install/rh/service.raid1.multipath.rhel6.ppc64.tmpl +++ b/xCAT-server/share/xcat/install/rh/service.raid1.multipath.rhel6.ppc64.tmpl @@ -18,7 +18,7 @@ keyboard "us" # # Clear the MBR # -zerombr +zerombr yes # # Wipe out the disk diff --git a/xCAT-server/share/xcat/install/rh/service.raid1.rhel6.ppc64.tmpl b/xCAT-server/share/xcat/install/rh/service.raid1.rhel6.ppc64.tmpl index b58225254..8cf0428e3 100644 --- a/xCAT-server/share/xcat/install/rh/service.raid1.rhel6.ppc64.tmpl +++ b/xCAT-server/share/xcat/install/rh/service.raid1.rhel6.ppc64.tmpl @@ -18,7 +18,7 @@ keyboard "us" # # Clear the MBR # -zerombr +zerombr yes # # Wipe out the disk diff --git a/xCAT-server/share/xcat/install/rh/service.rhels6.ppc64.tmpl b/xCAT-server/share/xcat/install/rh/service.rhels6.ppc64.tmpl index 509483367..149255612 100644 --- a/xCAT-server/share/xcat/install/rh/service.rhels6.ppc64.tmpl +++ b/xCAT-server/share/xcat/install/rh/service.rhels6.ppc64.tmpl @@ -18,7 +18,7 @@ keyboard "us" # # Clear the MBR # -zerombr +zerombr yes # # Wipe out the disk