linka-cloud/d2vm
2
0
Fork 0
mirror of https://github.com/linka-cloud/d2vm.git synced 2025-12-14 15:03:12 +00:00
Code Issues Releases Activity

add grub support

Browse Source 
Signed-off-by: Adphi <philippe.adrien.nousse@gmail.com>
This commit is contained in:
adphi
2023-09-11 15:42:06 +02:00
parent a003e176f5
commit 4e533b8044
17 changed files with 157 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
builder.go
View File

@@ -127,7 +127,7 @@ func NewBuilder(ctx context.Context, workdir, imgTag, disk string, size uint64,
if err != nil {
return nil, err
}
bl, err := blp.New(config)
bl, err := blp.New(config, osRelease)
if err != nil {
return nil, err
}
@@ -200,7 +200,7 @@ func (b *builder) Build(ctx context.Context) (err error) {
if err = b.setupRootFS(ctx); err != nil {
return err
}
if err = b.installKernel(ctx); err != nil {
if err = b.installBootloader(ctx); err != nil {
return err
}
if err = b.unmountImg(ctx); err != nil {
@@ -452,9 +452,9 @@ func (b *builder) cmdline(_ context.Context) string {
}
}
func (b *builder) installKernel(ctx context.Context) error {
logrus.Infof("installing linux kernel")
return b.bootloader.Setup(ctx, b.diskRaw, b.chPath("/boot"), b.cmdline(ctx))
func (b *builder) installBootloader(ctx context.Context) error {
logrus.Infof("installing bootloader")
return b.bootloader.Setup(ctx, b.loDevice, b.mntPoint, b.cmdline(ctx))
}
func (b *builder) convert2Img(ctx context.Context) error {