From 0abda982601f1bc8274fa820d134151c7c8e9454 Mon Sep 17 00:00:00 2001 From: Samveen Gulati Date: Mon, 12 Mar 2018 04:24:38 +0000 Subject: [PATCH 1/2] minor improvements to ks files --- .../xcat/install/centos/compute.centos7.tmpl | 2 +- .../share/xcat/install/rh/compute.rhels7.tmpl | 2 +- .../share/xcat/install/rh/kvm.rhels7.tmpl | 17 ++++++++++++++--- .../share/xcat/install/rh/service.rhels7.tmpl | 2 +- 4 files changed, 17 insertions(+), 6 deletions(-) diff --git a/xCAT-server/share/xcat/install/centos/compute.centos7.tmpl b/xCAT-server/share/xcat/install/centos/compute.centos7.tmpl index b8cc19ca5..71da3c7c9 100644 --- a/xCAT-server/share/xcat/install/centos/compute.centos7.tmpl +++ b/xCAT-server/share/xcat/install/centos/compute.centos7.tmpl @@ -33,6 +33,7 @@ clearpart --all --initlabel #XCAT_PARTITION_START# # xCAT based partitioning %include /tmp/partitionfile + #No RAID #/boot really significant for this sort of setup nowadays? #part /boot --size 50 --fstype ext3 @@ -134,7 +135,6 @@ rootpw --iscrypted #CRYPT:passwd:key=system,username=root:password# # OR auth --useshadow --enablemd5 - # # SE Linux # diff --git a/xCAT-server/share/xcat/install/rh/compute.rhels7.tmpl b/xCAT-server/share/xcat/install/rh/compute.rhels7.tmpl index b8cc19ca5..71da3c7c9 100644 --- a/xCAT-server/share/xcat/install/rh/compute.rhels7.tmpl +++ b/xCAT-server/share/xcat/install/rh/compute.rhels7.tmpl @@ -33,6 +33,7 @@ clearpart --all --initlabel #XCAT_PARTITION_START# # xCAT based partitioning %include /tmp/partitionfile + #No RAID #/boot really significant for this sort of setup nowadays? #part /boot --size 50 --fstype ext3 @@ -134,7 +135,6 @@ rootpw --iscrypted #CRYPT:passwd:key=system,username=root:password# # OR auth --useshadow --enablemd5 - # # SE Linux # diff --git a/xCAT-server/share/xcat/install/rh/kvm.rhels7.tmpl b/xCAT-server/share/xcat/install/rh/kvm.rhels7.tmpl index 9bc3b7250..e4525740b 100644 --- a/xCAT-server/share/xcat/install/rh/kvm.rhels7.tmpl +++ b/xCAT-server/share/xcat/install/rh/kvm.rhels7.tmpl @@ -31,13 +31,14 @@ clearpart --all --initlabel # #XCAT_PARTITION_START# +#Use script based partition table creation +%include /tmp/partitionfile + #No RAID #/boot really significant for this sort of setup nowadays? #part /boot --size 50 --fstype ext3 -%include /tmp/partitionfile #part swap --size 1024 #part / --size 1 --grow --fstype ext4 -#XCAT_PARTITION_END# #RAID 0 /scr for performance #part / --size 1024 --ondisk sda @@ -68,6 +69,7 @@ clearpart --all --initlabel #part raid.41 --size 1 --grow --ondisk sda #part raid.42 --size 1 --grow --ondisk sdb #raid /scr --level 1 --device md4 raid.41 raid.42 +#XCAT_PARTITION_END# # # bootloader config @@ -128,7 +130,6 @@ rootpw --iscrypted #CRYPT:passwd:key=system,username=root:password# # OR auth --useshadow --enablemd5 - # # SE Linux # @@ -146,8 +147,18 @@ reboot #INCLUDE_DEFAULT_PKGLIST# %end %pre +{ +echo "Running Kickstart Pre-Installation script..." #INCLUDE:#ENV:XCATROOT#/share/xcat/install/scripts/pre.rh.rhels7# +} &>>/tmp/pre-install.log %end %post +mkdir -p /var/log/xcat/ +{ +cat >> /var/log/xcat/xcat.log << "EOF" +%include /tmp/pre-install.log +EOF +echo "Running Kickstart Post-Installation script..." #INCLUDE:#ENV:XCATROOT#/share/xcat/install/scripts/post.xcat# +} &>>/var/log/xcat/xcat.log %end diff --git a/xCAT-server/share/xcat/install/rh/service.rhels7.tmpl b/xCAT-server/share/xcat/install/rh/service.rhels7.tmpl index b8cc19ca5..71da3c7c9 100644 --- a/xCAT-server/share/xcat/install/rh/service.rhels7.tmpl +++ b/xCAT-server/share/xcat/install/rh/service.rhels7.tmpl @@ -33,6 +33,7 @@ clearpart --all --initlabel #XCAT_PARTITION_START# # xCAT based partitioning %include /tmp/partitionfile + #No RAID #/boot really significant for this sort of setup nowadays? #part /boot --size 50 --fstype ext3 @@ -134,7 +135,6 @@ rootpw --iscrypted #CRYPT:passwd:key=system,username=root:password# # OR auth --useshadow --enablemd5 - # # SE Linux # From 67a633361fa697b1345f53798144f3e042993ec3 Mon Sep 17 00:00:00 2001 From: Samveen Gulati Date: Tue, 11 Sep 2018 05:03:15 +0000 Subject: [PATCH 2/2] Fix RH/C 7 kvm templates to add NM disable postscript --- xCAT-server/share/xcat/install/centos/kvm.centos7.tmpl | 8 +++----- xCAT-server/share/xcat/install/rh/kvm.rhels7.tmpl | 10 ++++++++-- 2 files changed, 11 insertions(+), 7 deletions(-) diff --git a/xCAT-server/share/xcat/install/centos/kvm.centos7.tmpl b/xCAT-server/share/xcat/install/centos/kvm.centos7.tmpl index 17e6078c4..71da3c7c9 100644 --- a/xCAT-server/share/xcat/install/centos/kvm.centos7.tmpl +++ b/xCAT-server/share/xcat/install/centos/kvm.centos7.tmpl @@ -12,8 +12,6 @@ lang en_US %include /tmp/repos -#INSTALL_SOURCES# - #device ethernet e100 keyboard "us" @@ -25,8 +23,7 @@ zerombr # # Wipe out the disk # -# Clear partitioning via partitition file -#clearpart --all --initlabel +clearpart --all --initlabel #clearpart --linux # @@ -34,7 +31,7 @@ zerombr # #XCAT_PARTITION_START# -#Use script based partition table creation +# xCAT based partitioning %include /tmp/partitionfile #No RAID @@ -168,5 +165,6 @@ cat >> /var/log/xcat/xcat.log << "EOF" EOF echo "Running Kickstart Post-Installation script..." #INCLUDE:#ENV:XCATROOT#/share/xcat/install/scripts/post.xcat# +#INCLUDE:#ENV:XCATROOT#/share/xcat/install/scripts/post.rhels7# } &>>/var/log/xcat/xcat.log %end diff --git a/xCAT-server/share/xcat/install/rh/kvm.rhels7.tmpl b/xCAT-server/share/xcat/install/rh/kvm.rhels7.tmpl index e4525740b..71da3c7c9 100644 --- a/xCAT-server/share/xcat/install/rh/kvm.rhels7.tmpl +++ b/xCAT-server/share/xcat/install/rh/kvm.rhels7.tmpl @@ -31,7 +31,7 @@ clearpart --all --initlabel # #XCAT_PARTITION_START# -#Use script based partition table creation +# xCAT based partitioning %include /tmp/partitionfile #No RAID @@ -77,7 +77,12 @@ clearpart --all --initlabel # --useLilo # --md5pass # -bootloader +#The bootloader config here is commented out +#For user customized partition file or partition script, +#the bootloader configuration should be specified in the user customized partition file/script +#For the xCAT default partition scheme, the bootloader configuration is in /tmp/partitionfile +#which is generated in %pre section +##KICKSTARTBOOTLOADER# # # install or upgrade @@ -160,5 +165,6 @@ cat >> /var/log/xcat/xcat.log << "EOF" EOF echo "Running Kickstart Post-Installation script..." #INCLUDE:#ENV:XCATROOT#/share/xcat/install/scripts/post.xcat# +#INCLUDE:#ENV:XCATROOT#/share/xcat/install/scripts/post.rhels7# } &>>/var/log/xcat/xcat.log %end