Superminaren
/
kvm
mirror of https://github.com/jetkvm/kvm.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

cleanup

This commit is contained in:
Adrian 2025-01-24 19:16:09 -06:00
parent 8329137bae
commit f8e668349b
1 changed files with 21 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
usb.go
View File

@ -19,6 +19,22 @@ const gadgetPath = "/sys/kernel/config/usb_gadget"
const kvmGadgetPath = "/sys/kernel/config/usb_gadget/jetkvm" const kvmGadgetPath = "/sys/kernel/config/usb_gadget/jetkvm"
const configC1Path = "/sys/kernel/config/usb_gadget/jetkvm/configs/c.1" const configC1Path = "/sys/kernel/config/usb_gadget/jetkvm/configs/c.1"
func mountConfigFS() error {
logger.Infof("Checking for gadgetPath: %s ...", gadgetPath)
_, err := os.Stat(gadgetPath)
if os.IsNotExist(err) {
logger.Infof("running mount command...")
err = exec.Command("mount", "-t", "configfs", "none", configFSPath).Run()
if err != nil {
return fmt.Errorf("failed to mount configfs: %w", err)
}
} else {
return fmt.Errorf("unable to access usb gadget path: %w", err)
}
logger.Infof("Successfully mounted usb gadget at %s", gadgetPath)
return nil
}
func init() { func init() {
_ = os.MkdirAll(imagesFolder, 0755) _ = os.MkdirAll(imagesFolder, 0755)
udcs := gadget.GetUdcs() udcs := gadget.GetUdcs()
@ -82,22 +98,6 @@ func UpdateGadgetConfig() error {
return nil return nil
} }
func mountConfigFS() error {
logger.Infof("Checking for gadgetPath: %s ...", gadgetPath)
_, err := os.Stat(gadgetPath)
if os.IsNotExist(err) {
logger.Infof("running mount command...")
err = exec.Command("mount", "-t", "configfs", "none", configFSPath).Run()
if err != nil {
return fmt.Errorf("failed to mount configfs: %w", err)
}
} else {
return fmt.Errorf("unable to access usb gadget path: %w", err)
}
logger.Infof("Successfully mounted usb gadget at %s", gadgetPath)
return nil
}
func writeGadgetAttrs(basePath string, attrs [][]string) error { func writeGadgetAttrs(basePath string, attrs [][]string) error {
for _, item := range attrs { for _, item := range attrs {
filePath := filepath.Join(basePath, item[0]) filePath := filepath.Join(basePath, item[0])
@ -122,8 +122,8 @@ func writeGadgetConfig() error {
LoadConfig() LoadConfig()
gadgetAttrs := [][]string{ gadgetAttrs := [][]string{
{"bcdUSB", "0x0200"}, //USB 2.0 {"bcdUSB", "0x0200"}, //USB 2.0
{"idVendor", config.UsbConfig.UsbVendorId}, {"idVendor", "0x1d6b"},
{"idProduct", config.UsbConfig.UsbProductId}, {"idProduct", "0104"},
{"bcdDevice", "0100"}, {"bcdDevice", "0100"},
} }
err = writeGadgetAttrs(kvmGadgetPath, gadgetAttrs) err = writeGadgetAttrs(kvmGadgetPath, gadgetAttrs)
@ -139,9 +139,9 @@ func writeGadgetConfig() error {
} }
strAttrs := [][]string{ strAttrs := [][]string{
{"serialnumber", config.UsbConfig.UsbSerialNumber}, {"serialnumber", GetDeviceID()},
{"manufacturer", config.UsbConfig.UsbManufacturer}, {"manufacturer", "JetKVM"},
{"product", config.UsbConfig.UsbName}, {"product", "JetKVM USB Emulation Device"},
} }
err = writeGadgetAttrs(gadgetStringsPath, strAttrs) err = writeGadgetAttrs(gadgetStringsPath, strAttrs)
if err != nil { if err != nil {