clone/kvm
1
0
Fork 0
mirror of https://github.com/luckfox-eng29/kvm.git synced 2026-01-18 03:28:19 +01:00
Code Issues Packages Projects Releases Wiki Activity

fix: configFS might not be mounted if the directory exists (#479)

Browse Source
This commit is contained in:
Aveline
2025-05-19 23:59:02 +02:00
committed by GitHub
parent 8cf6b40dc3
commit eeb103adf9
3 changed files with 31 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
internal/usbgadget/config_tx.go
View File

@@ -81,11 +81,12 @@ func (tx *UsbGadgetTransaction) addFileChange(component string, change Requested
return key
}
func (tx *UsbGadgetTransaction) mkdirAll(component string, path string, description string) string {
func (tx *UsbGadgetTransaction) mkdirAll(component string, path string, description string, deps []string) string {
return tx.addFileChange(component, RequestedFileChange{
Path: path,
ExpectedState: FileStateDirectory,
Description: description,
DependsOn: deps,
})
}
@@ -131,14 +132,25 @@ func (tx *UsbGadgetTransaction) MountConfigFS() {
}
func (tx *UsbGadgetTransaction) CreateConfigPath() {
tx.mkdirAll("gadget", tx.configC1Path, "create config path")
tx.mkdirAll(
"gadget",
tx.configC1Path,
"create config path",
[]string{configFSPath},
)
}
func (tx *UsbGadgetTransaction) WriteGadgetConfig() {
// create kvm gadget path
tx.mkdirAll("gadget", tx.kvmGadgetPath, "create kvm gadget path")
tx.mkdirAll(
"gadget",
tx.kvmGadgetPath,
"create kvm gadget path",
[]string{tx.configC1Path},
)
deps := make([]string, 0)
deps = append(deps, tx.kvmGadgetPath)
for _, val := range tx.orderedConfigItems {
key := val.key
@@ -188,7 +200,10 @@ func (tx *UsbGadgetTransaction) writeGadgetItemConfig(item gadgetConfigItem, dep
files = append(files, deps...)
gadgetItemPath := joinPath(tx.kvmGadgetPath, item.path)
files = append(files, tx.mkdirAll(component, gadgetItemPath, "create gadget item directory"))
if gadgetItemPath != tx.kvmGadgetPath {
gadgetItemDir := tx.mkdirAll(component, gadgetItemPath, "create gadget item directory", files)
files = append(files, gadgetItemDir)
}
beforeChange := make([]string, 0)
disableGadgetItemKey := fmt.Sprintf("disable-%s", item.device)
@@ -231,7 +246,10 @@ func (tx *UsbGadgetTransaction) writeGadgetItemConfig(item gadgetConfigItem, dep
// create config directory if configAttrs are set
if len(item.configAttrs) > 0 {
configItemPath := joinPath(tx.configC1Path, item.configPath)
tx.mkdirAll(component, configItemPath, "create config item directory")
if configItemPath != tx.configC1Path {
configItemDir := tx.mkdirAll(component, configItemPath, "create config item directory", files)
files = append(files, configItemDir)
}
files = append(files, tx.writeGadgetAttrs(
configItemPath,
item.configAttrs,