xCAT/xcat-core
2
0
Fork 0
mirror of https://github.com/xcat2/xcat-core.git synced 2025-10-31 03:12:30 +00:00
Code Issues Releases Wiki Activity

fix issue#821@github,support <bootloader --boot-drive> in kickstart file for rhels7

Browse Source
This commit is contained in:
immarvin
2016-05-16 04:15:10 -04:00
parent 8daa5b8e07
commit c68304b87d
3 changed files with 25 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
xCAT-server/share/xcat/install/rh/compute.rhels7.tmpl
View File

@@ -75,7 +75,12 @@ clearpart --all --initlabel
# --useLilo
# --md5pass <crypted MD5 password for GRUB>
#
#KICKSTARTBOOTLOADER#
#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/partitioning
#which is generated in %pre section
##KICKSTARTBOOTLOADER#
#

8
xCAT-server/share/xcat/install/rh/service.rhels7.tmpl
View File

@@ -75,7 +75,13 @@ clearpart --all --initlabel
# --useLilo
# --md5pass <crypted MD5 password for GRUB>
#
#KICKSTARTBOOTLOADER#
#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/partitioning
#which is generated in %pre section
##KICKSTARTBOOTLOADER#
#
# install or upgrade
#

12
xCAT-server/share/xcat/install/scripts/pre.rh.rhels7
View File

@@ -191,6 +191,18 @@ echo "part swap --recommended --ondisk $instdisk" >> /tmp/partitioning
echo "part pv.01 --size 1 --grow --ondisk $instdisk" >> /tmp/partitioning
echo "volgroup system pv.01" >> /tmp/partitioning
echo "logvol / --vgname=system --name=root --size 1 --grow --fstype $FSTYPE" >> /tmp/partitioning
#specify "bootloader" configuration in "/tmp/partitioning" if there is no user customized partition file
BOOTLOADER="bootloader "
#specify the kernel options which will be persistent after installation
[ -n "#ENV:PERSKCMDLINE#" ] && BOOTLOADER=$BOOTLOADER" --append=#ENV:PERSKCMDLINE#"
#Specifies which drive the boot loader should be written to
#and therefore which drive the computer will boot from.
[ -n "$instdisk" ] && BOOTLOADER=$BOOTLOADER" --boot-drive=$(basename $instdisk)"
echo "$BOOTLOADER" >> /tmp/partitioning
#XCA_PARTITION_SCRIPT#