From ff25195d5bfa03ba705059f5312d42496df61db0 Mon Sep 17 00:00:00 2001 From: wanghuaz Date: Fri, 10 Feb 2012 06:22:45 +0000 Subject: [PATCH] Replace 'zerombr yes' with 'zerombr' for rhels6 according to red hat bugzilla 241666 git-svn-id: https://svn.code.sf.net/p/xcat/code/xcat-core/trunk@11533 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 | 4 ++-- 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, 11 insertions(+), 11 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 b39948022..b789b611e 100644 --- a/xCAT-server/share/xcat/install/rh/compute.rhels6.ppc64.tmpl +++ b/xCAT-server/share/xcat/install/rh/compute.rhels6.ppc64.tmpl @@ -16,7 +16,7 @@ keyboard "us" # # Clear the MBR # -zerombr yes +zerombr # # 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 dffd4e8fd..ab52e595f 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 yes +zerombr clearpart --initlabel --drives=dasda part / --fstype ext3 --size=100 --grow --ondisk=dasda part swap --size=512 --ondisk=dasda @@ -25,4 +25,4 @@ part swap --size=512 --ondisk=dasda %packages replace_software_packages -%post \ No newline at end of file +%post diff --git a/xCAT-server/share/xcat/install/rh/compute.rhels6.tmpl b/xCAT-server/share/xcat/install/rh/compute.rhels6.tmpl index f693465bd..3d0fd89c6 100644 --- a/xCAT-server/share/xcat/install/rh/compute.rhels6.tmpl +++ b/xCAT-server/share/xcat/install/rh/compute.rhels6.tmpl @@ -15,7 +15,7 @@ keyboard "us" # # Clear the MBR # -zerombr yes +zerombr # # 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 c4b4067ef..da0d02890 100644 --- a/xCAT-server/share/xcat/install/rh/compute_ad.rhels6.tmpl +++ b/xCAT-server/share/xcat/install/rh/compute_ad.rhels6.tmpl @@ -16,7 +16,7 @@ keyboard "us" # # Clear the MBR # -zerombr yes +zerombr # # 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 9ffa7b55b..74d83cbae 100644 --- a/xCAT-server/share/xcat/install/rh/hpc.rhels6.tmpl +++ b/xCAT-server/share/xcat/install/rh/hpc.rhels6.tmpl @@ -16,7 +16,7 @@ keyboard "us" # # Clear the MBR # -zerombr yes +zerombr # # 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 e1d433b08..047dc238c 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 yes +zerombr # # 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 9ffa7b55b..74d83cbae 100644 --- a/xCAT-server/share/xcat/install/rh/kvm.rhels6.tmpl +++ b/xCAT-server/share/xcat/install/rh/kvm.rhels6.tmpl @@ -16,7 +16,7 @@ keyboard "us" # # Clear the MBR # -zerombr yes +zerombr # # 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 57adf0afc..a7e674f6e 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 yes +zerombr # # 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 8cf0428e3..b58225254 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 yes +zerombr # # 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 0148d318b..7e35a2185 100644 --- a/xCAT-server/share/xcat/install/rh/service.rhels6.ppc64.tmpl +++ b/xCAT-server/share/xcat/install/rh/service.rhels6.ppc64.tmpl @@ -17,7 +17,7 @@ keyboard "us" # # Clear the MBR # -zerombr yes +zerombr # # Wipe out the disk