xCAT/xcat-core
2
0
Fork 0
mirror of https://github.com/xcat2/xcat-core.git synced 2025-08-23 19:50:21 +00:00
Code Issues Releases Wiki Activity

Merge pull request #326 from jjohnson42/master

Browse Source 
If TFTPDIR does not begin with /, correct it
This commit is contained in:
Xiaopeng Wang
2015-11-05 13:28:23 +08:00
parent e2150f039d 0b1bb80853
commit 4388100166
2 changed files with 4 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
xCAT-server/share/xcat/install/centos/compute.centos7.tmpl
View File

@@ -147,7 +147,7 @@ reboot
#INCLUDE_DEFAULT_PKGLIST#
%end
%pre
#INCLUDE:#ENV:XCATROOT#/share/xcat/install/scripts/pre.rh.rhel7#
#INCLUDE:#ENV:XCATROOT#/share/xcat/install/scripts/pre.rh.rhels7#
%end
%post
#INCLUDE:#ENV:XCATROOT#/share/xcat/install/scripts/post.xcat#

3
xCAT-server/share/xcat/install/scripts/post.xcat
View File

@@ -19,6 +19,9 @@ if [ -z "$TFTPDIR" ]; then
TFTPDIR="/tftpboot"
fi
if [[ $TFTPDIR != /* ]]; then
TFTPDIR="/"$TFTPDIR
fi
cd /tmp
RAND=$(perl -e 'print int(rand(50)). "\n"')