From 7794cedd1c761cbb73960ea4abad9b9dd7a326d7 Mon Sep 17 00:00:00 2001
From: Jian Qiu <swordqiu@gmail.com>
Date: Mon, 5 Dec 2022 23:41:14 +0800
Subject: [PATCH] fix: allow baremetal to specify external tftp server and file
 (#15490)

Co-authored-by: Qiu Jian <qiujian@yunionyun.com>
---
 pkg/baremetal/nic.go             | 31 ++++++++++++++++++++++---------
 pkg/baremetal/options/options.go |  4 ++++
 2 files changed, 26 insertions(+), 9 deletions(-)

diff --git a/pkg/baremetal/nic.go b/pkg/baremetal/nic.go
index 7192077896..528795c697 100644
--- a/pkg/baremetal/nic.go
+++ b/pkg/baremetal/nic.go
@@ -93,6 +93,9 @@ func GetNicDHCPConfig(
 
 	if isPxe {
 		conf.BootServer = serverIP
+		if len(o.Options.TftpBootServer) > 0 {
+			conf.BootServer = o.Options.TftpBootServer
+		}
 		switch arch {
 		case dhcp.CLIENT_ARCH_EFI_BC, dhcp.CLIENT_ARCH_EFI_X86_64:
 			if o.Options.BootLoader == o.BOOT_LOADER_SYSLINUX {
@@ -116,21 +119,31 @@ func GetNicDHCPConfig(
 				conf.BootFile = "grub_booti386"
 			}
 		}
-		pxePath := filepath.Join(o.Options.TftpRoot, conf.BootFile)
-		if f, err := os.Open(pxePath); err != nil {
-			return nil, err
+		if len(o.Options.TftpBootFilename) > 0 {
+			conf.BootFile = o.Options.TftpBootFilename
+		}
+		if len(o.Options.TftpBootServer) > 0 {
+			conf.BootBlock = getPxeBlockSize(o.Options.TftpBootFilesize)
 		} else {
-			if info, err := f.Stat(); err != nil {
+			pxePath := filepath.Join(o.Options.TftpRoot, conf.BootFile)
+			if f, err := os.Open(pxePath); err != nil {
 				return nil, err
 			} else {
-				pxeSize := info.Size()
-				pxeBlk := pxeSize / 512
-				if pxeSize > pxeBlk*512 {
-					pxeBlk += 1
+				if info, err := f.Stat(); err != nil {
+					return nil, err
+				} else {
+					conf.BootBlock = getPxeBlockSize(info.Size())
 				}
-				conf.BootBlock = uint16(pxeBlk)
 			}
 		}
 	}
 	return conf, nil
 }
+
+func getPxeBlockSize(pxeSize int64) uint16 {
+	pxeBlk := pxeSize / 512
+	if pxeSize > pxeBlk*512 {
+		pxeBlk += 1
+	}
+	return uint16(pxeBlk)
+}
diff --git a/pkg/baremetal/options/options.go b/pkg/baremetal/options/options.go
index 02b9e0b873..ceca6fd7cf 100644
--- a/pkg/baremetal/options/options.go
+++ b/pkg/baremetal/options/options.go
@@ -57,6 +57,10 @@ type BaremetalOptions struct {
 	UseMegaRaidPerccli bool              `help:"Use MegaRAID perccli" default:"false"`
 
 	NfsBootRootfs string `help:"nfs root fs URL"`
+
+	TftpBootServer   string `help:"customized tftp boot server"`
+	TftpBootFilename string `help:"filename of tftp boot loader"`
+	TftpBootFilesize int64  `help:"file size of tftp boot loader"`
 }
 
 const (