Skip to content

Remove legacy code regarding disk.json #183

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
simcod wants to merge 1 commit into
base: master
Choose a base branch
from
+0 −26
Open

Remove legacy code regarding disk.json #183

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
26 changes: 0 additions & 26 deletions cmd/storage/filesystem.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
package storage

import (
"encoding/json"
"fmt"
"log/slog"
gos "os"
Expand Down Expand Up @@ -89,11 +88,6 @@ func (f *Filesystem) Run() error {
return fmt.Errorf("mount special filesystems failed:%w", err)
}

// TODO legacy image support, can be removed once all images in use do no depend on disk.json anymore
err = f.createDiskJSON()
if err != nil {
return fmt.Errorf("disk.json creation failed:%w", err)
}
return nil
}
func (f *Filesystem) Umount() {
Expand Down Expand Up @@ -474,26 +468,6 @@ func (f *Filesystem) CreateFSTab() error {
return f.fstabEntries.write(f.log, f.chroot)
}

func (f *Filesystem) createDiskJSON() error {
configdir := path.Join(f.chroot, "etc", "metal")
destination := path.Join(configdir, "disk.json")

if _, err := gos.Stat(configdir); err != nil && gos.IsNotExist(err) {
if err := gos.MkdirAll(configdir, 0755); err != nil {
return err
}
} else if err != nil {
return err
}

j, err := json.MarshalIndent(f.disk, "", " ")
if err != nil {
return fmt.Errorf("unable to marshal to json %w", err)
}
f.log.Info("create legacy disk.json", "content", string(j))
return gos.WriteFile(destination, j, 0600)
}

func mountFs(log *slog.Logger, chroot string, fs models.V1Filesystem) (string, error) {
if fs.Format == nil || *fs.Format == "swap" || *fs.Format == "" || *fs.Format == "tmpfs" {
return "", nil
Expand Down
Loading