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

fix issue Function "httpport" can not work on ubuntu + netboot=grub2 scenario #5869 (#5871)

Browse Source 
* support site.httpport in ubuntu diskless

* fix issue Function httpport can not work on ubuntu + netboot=grub2 scenario #5869
This commit is contained in:
yangsong 2018-12-13 14:38:55 +08:00 committed by Bin Xu
parent 4181906e5b
commit 7a18f5beee
3 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
xCAT-server/lib/perl/xCAT/Template.pm
View File

@ -391,6 +391,7 @@ sub subvars {
$inc =~ s/#SHORTNAME#/$shortname/g;
$inc =~ s/#GETNODEDOMAIN:([^#]+)#/get_node_domain($1)/eg;
$inc =~ s/#GETPRINICMAC:([^#]+)#/xCAT::Utils::parseMacTabEntry(tabdb("mac",$1,"mac"),$1)/eg;
$inc =~ s/#COLONHTTPPORT#/$httpportsuffix/eg;
if (($::XCATSITEVALS{xcatdebugmode} eq "1") or ($::XCATSITEVALS{xcatdebugmode} eq "2")) {
$inc =~ s/#UNCOMMENTOENABLEDEBUGPORT#/ /g;

2
xCAT-server/lib/xcat/plugins/debian.pm
View File

@ -872,7 +872,7 @@ sub mkinstall {
my $kcmdline = "nofb utf8 auto url=http://" . $instserver . ":$httpport/install/autoinst/" . $node;
$kcmdline .= " xcatd=" . $instserver;
$kcmdline .= " mirror/http/hostname=" . $instserver;
$kcmdline .= " mirror/http/hostname=" . $instserver.":$httpport";
if ($maxmem) {
$kcmdline .= " mem=$maxmem";
}

4
xCAT-server/share/xcat/install/ubuntu/compute.tmpl
View File

@ -124,7 +124,7 @@ xserver-xorg xserver-xorg/config/monitor/mode-list \
d-i preseed/early_command string \
{ \
echo "Running preseeding early_command Installation script..."; \
wget http://`cat /tmp/xcatserver`/install/autoinst/#HOSTNAME#.pre; \
wget http://`cat /tmp/xcatserver`#COLONHTTPPORT#/install/autoinst/#HOSTNAME#.pre; \
chmod u+x #HOSTNAME#.pre; \
./#HOSTNAME#.pre; \
umount /media || true; \
@ -135,7 +135,7 @@ d-i preseed/late_command string \
{ \
cat /tmp/pre-install.log >> /target/var/log/xcat/xcat.log; \
echo "Running preseeding late_command Installation script..."; \
wget http://`cat /tmp/xcatserver`/install/autoinst/#HOSTNAME#.post; \
wget http://`cat /tmp/xcatserver`#COLONHTTPPORT#/install/autoinst/#HOSTNAME#.post; \
chmod u+x #HOSTNAME#.post; \
cp ./#HOSTNAME#.post /target/root/post.script; \
mount -o bind /proc /target/proc -t proc; \