From bec1ab9762a19e035d59762289e5328ed76c9bf4 Mon Sep 17 00:00:00 2001 From: GONG Jie Date: Sun, 31 Dec 2017 23:59:59 +0000 Subject: [PATCH] Remove trailing spaces in file xCAT-buildkit/share/xcat/kits/kit_build/chef/chef-x86_64/buildkit.conf --- .../kit_build/chef/chef-x86_64/buildkit.conf | 82 +++++++++---------- 1 file changed, 41 insertions(+), 41 deletions(-) diff --git a/xCAT-buildkit/share/xcat/kits/kit_build/chef/chef-x86_64/buildkit.conf b/xCAT-buildkit/share/xcat/kits/kit_build/chef/chef-x86_64/buildkit.conf index bc42a7e94..42bf16678 100644 --- a/xCAT-buildkit/share/xcat/kits/kit_build/chef/chef-x86_64/buildkit.conf +++ b/xCAT-buildkit/share/xcat/kits/kit_build/chef/chef-x86_64/buildkit.conf @@ -1,13 +1,13 @@ # Kit Build File -# +# # This file was initially auto-generated by the buildkit CLI command. # To create a new kit, the user should modify this file accordingly. # Refer to the buildkit manpage for further details. # -# kit: This section defines general info for the Kit. +# kit: This section defines general info for the Kit. # There must be exactly one kit section in a kit build file. -# +# # kit attributes: # basename (mandatory) Kit base name. e.g., kit-lsf # description (optional) Kit description. @@ -24,7 +24,7 @@ # kitlicense (mandatory) Kit license string to be built into all # kitcomponent packages # kittarfilename (optional) Filename.tar.bz2 to be used for the generated -# kit. Default is --.tar.bz2 +# kit. Default is --.tar.bz2 kit: basename=chef description=Kit for installing chef server, client and workstation @@ -35,9 +35,9 @@ kit: # kitrepo: This section defines a Kit Package Repository. -# There must be at least one kitrepo section in a kit build file. +# There must be at least one kitrepo section in a kit build file. # If you want to support multiple OSes, you should create a separate -# repo for each OS. Also, no two repos can be defined with the same +# repo for each OS. Also, no two repos can be defined with the same # OS name, major/minor version and arch. For example, you cannot have # two repos for RHEL 6.2 x86_64 in the same kit. # @@ -48,7 +48,7 @@ kit: # osmajorversion (mandatory) OS major version. e.g., 6 # osminorversion (optional) OS minor version. # osarch (mandatory) OS architecture. e.g., x86_64 -# compat_osbasenames (optional) Comma-separated list of compatible +# compat_osbasenames (optional) Comma-separated list of compatible # OS distro base names. e.g., centos kitrepo: @@ -61,14 +61,14 @@ kitrepo: #compat_osbasenames= -# kitcomponent: This section defines one Kit Component. -# There can be zero or more kitcomponent sections. +# kitcomponent: This section defines one Kit Component. +# There can be zero or more kitcomponent sections. # If you want to build a component which supports multiple OSes, -# you should create one kitcomponent section for each OS. -# Also, no two components in a kit can be defined with the same -# base name. +# you should create one kitcomponent section for each OS. +# Also, no two components in a kit can be defined with the same +# base name. # You can define multiple kit components with the same base name -# only if each kit component using this base name meets these +# only if each kit component using this base name meets these # requirements: # - Each kit component must be defined with the same version # and release number @@ -95,20 +95,20 @@ kitrepo: # kitpkgdeps (optional) Comma-separated list of kit package names that # will be listed as "REQUIRES" when building this kit # component. Each package must be defined in a separate -# kitpackage section. Each package must be in the same +# kitpackage section. Each package must be in the same # kitrepo as this kit component. -# non_native_pkgs (optional) -# Comma-separated list of non-native package -# paths that will be included as files in this kit -# component. All filenames are relative to +# non_native_pkgs (optional) +# Comma-separated list of non-native package +# paths that will be included as files in this kit +# component. All filenames are relative to # /source_packages and may contain # wildcards. If a filename is prefixed by 'EXTERNALPKGS:' # the file will not be built into the kit tarfile, but # will need to be added later with a 'buildkit addpkgs' -# command. -# Files will be placed in +# command. +# Files will be placed in # /opt/xcat/kits// -# when the kitcomponent package is deployed to an +# when the kitcomponent package is deployed to an # OS image. # Kit component deployment scripts must be specified # to manage these files. @@ -117,11 +117,11 @@ kitrepo: # section. # exlist (optional) Exclude list file for stateless image, relative # to /other_files -# Kit component deployment scripts (optional) Each attribute specifies +# Kit component deployment scripts (optional) Each attribute specifies # script path relative to /scripts # Script attributes: -# preinstall, postinstall, preuninstall, postuninstall, -# preupgrade, postupgrade, postbootscripts, +# preinstall, postinstall, preuninstall, postuninstall, +# preupgrade, postupgrade, postbootscripts, # genimage_postinstall kitcomponent: basename=chef_server_kit @@ -132,7 +132,7 @@ kitcomponent: kitrepoid=rhels6_x86_64 kitpkgdeps=chef-server postinstall=server.rpm_post - postbootscripts=server.post + postbootscripts=server.post kitcomponent: basename=chef_client_kit @@ -143,7 +143,7 @@ kitcomponent: kitrepoid=rhels6_x86_64 kitpkgdeps=chef postinstall=client.rpm_post - postbootscripts=client.post + postbootscripts=client.post kitcomponent: basename=chef_workstation_kit @@ -159,38 +159,38 @@ kitcomponent: # kitpackage: This section defines one Kit Package, and how to build it. -# There can be zero or more kitpackage sections. +# There can be zero or more kitpackage sections. # All filenames should be relative paths to -# /source_packages -# If you want to build a package which can run on multiple OSes, +# /source_packages +# If you want to build a package which can run on multiple OSes, # you have two options: -# 1. Build a separate package for each OS you want to support. -# For this option, you need to define one kitpackage section +# 1. Build a separate package for each OS you want to support. +# For this option, you need to define one kitpackage section # per supported OS. -# 2. Build one package that can run on multiple OSes. -# If you are building an RPM package, you are responsible for -# creating an RPM spec file that can run on multiple OSes. +# 2. Build one package that can run on multiple OSes. +# If you are building an RPM package, you are responsible for +# creating an RPM spec file that can run on multiple OSes. # For this option, you need to define one kitpackage section # which contains multiple kitrepoid lines. -# +# # kitpackage attributes: -# filename (mandatory) Package filename. +# filename (mandatory) Package filename. # kitrepoid (mandatory) A comma-separated list of kit reponames this package # belongs to. If multiple repos are defined, the package will # be built for the first repo only. For the other repos, # a symlink is created to the package built for the first repo. -# Package build methods (optional) -# Define how to build the packages. +# Package build methods (optional) +# Define how to build the packages. # If you don't specify a build method, the default behavior is -# to assume the package is pre-built under +# to assume the package is pre-built under # /source_packages -# All files in this section are relative to +# All files in this section are relative to # /source_packages # There are four methods to build packages. # 1. Use pre-built RPM package # The filename may contain wildcards to avoid needing to # specify an explicit package version-release filename. -# isexternalpkg: 'no'|'0', 'yes'|'1' (default: 'no') +# isexternalpkg: 'no'|'0', 'yes'|'1' (default: 'no') # Indicates whether the RPM package will be added to the # the kit tar file now as part of the kit build process, # or whether the customer will need to separately