Compare commits

..

No commits in common. "19bd161a7f20e487fbd84a10e72fecc085168235" and "63c2272c4589c9b052ee75d5496a555af1a1632b" have entirely different histories.

4 changed files with 7 additions and 22 deletions

View File

@ -77,14 +77,11 @@ func Main() {
initUsbGadget() initUsbGadget()
if err := setInitialVirtualMediaState(); err != nil { err = setInitialVirtualMediaState()
if err != nil {
logger.Warn().Err(err).Msg("failed to set initial virtual media state") logger.Warn().Err(err).Msg("failed to set initial virtual media state")
} }
if err := initImagesFolder(); err != nil {
logger.Warn().Err(err).Msg("failed to init images folder")
}
go func() { go func() {
time.Sleep(15 * time.Minute) time.Sleep(15 * time.Minute)
for { for {

Binary file not shown.

View File

@ -1 +1 @@
6dabd0e657dd099280d9173069687786a4a8c9c25cf7f9e7ce2f940cab67c521 4b925c7aa73d2e35a227833e806658cb17e1d25900611f93ed70b11ac9f1716d

View File

@ -94,20 +94,9 @@ var nbdDevice *NBDDevice
const imagesFolder = "/userdata/jetkvm/images" const imagesFolder = "/userdata/jetkvm/images"
func initImagesFolder() error {
err := os.MkdirAll(imagesFolder, 0755)
if err != nil {
return fmt.Errorf("failed to create images folder: %w", err)
}
return nil
}
func rpcMountBuiltInImage(filename string) error { func rpcMountBuiltInImage(filename string) error {
logger.Info().Str("filename", filename).Msg("Mount Built-In Image") logger.Info().Str("filename", filename).Msg("Mount Built-In Image")
if err := initImagesFolder(); err != nil { _ = os.MkdirAll(imagesFolder, 0755)
return err
}
imagePath := filepath.Join(imagesFolder, filename) imagePath := filepath.Join(imagesFolder, filename)
// Check if the file exists in the imagesFolder // Check if the file exists in the imagesFolder
@ -235,14 +224,13 @@ func getInitialVirtualMediaState() (*VirtualMediaState, error) {
} }
// TODO: check if it's WebRTC or HTTP // TODO: check if it's WebRTC or HTTP
switch diskPath { if diskPath == "" {
case "":
return nil, nil return nil, nil
case "/dev/nbd0": } else if diskPath == "/dev/nbd0" {
initialState.Source = HTTP initialState.Source = HTTP
initialState.URL = "/" initialState.URL = "/"
initialState.Size = 1 initialState.Size = 1
default: } else {
initialState.Filename = filepath.Base(diskPath) initialState.Filename = filepath.Base(diskPath)
// get size from file // get size from file
logger.Info().Str("diskPath", diskPath).Msg("getting file size") logger.Info().Str("diskPath", diskPath).Msg("getting file size")