Merge dafebacdfd into 31ea366e51

internal/usbgadget/config.go

@@ -177,7 +177,7 @@ func (u *UsbGadget) Init() error {
 
 	u.udc = udcs[0]
 
-	err := u.configureUsbGadget(false)
+	err := u.configureUsbGadget(false, true)
 	if err != nil {
 		return u.logError("unable to initialize USB stack", err)
 	}
@@ -185,13 +185,13 @@ func (u *UsbGadget) Init() error {
 	return nil
 }
 
-func (u *UsbGadget) UpdateGadgetConfig() error {
+func (u *UsbGadget) UpdateGadgetConfig(resetUsbIfNeeded bool) error {
 	u.configLock.Lock()
 	defer u.configLock.Unlock()
 
 	u.loadGadgetConfig()
 
-	err := u.configureUsbGadget(true)
+	err := u.configureUsbGadget(true, resetUsbIfNeeded)
 	if err != nil {
 		return u.logError("unable to update gadget config", err)
 	}
@@ -199,14 +199,28 @@ func (u *UsbGadget) UpdateGadgetConfig() error {
 	return nil
 }
 
-func (u *UsbGadget) configureUsbGadget(resetUsb bool) error {
+func (u *UsbGadget) configureUsbGadget(resetUsb bool, resetUsbIfNeeded bool) error {
-	return u.WithTransaction(func() error {
+	f := func(resetUsbBefore bool, resetUsbAfter bool) func() error {
-		u.tx.MountConfigFS()
+		return func() error {
-		u.tx.CreateConfigPath()
+			if resetUsbBefore {
-		u.tx.WriteGadgetConfig()
+				u.tx.RebindUsb(true)
-		if resetUsb {
+			}
-			u.tx.RebindUsb(true)
+			u.tx.MountConfigFS()
+			u.tx.CreateConfigPath()
+			u.tx.WriteGadgetConfig()
+			if resetUsbAfter {
+				u.tx.RebindUsb(true)
+			}
+			return nil
 		}
-		return nil
+	}
-	})
+
+	// initial attempt to configure the gadget
+	err := u.WithTransaction(f(false, resetUsb))
+	if err != nil && !resetUsbIfNeeded {
+		return err
+	}
+
+	// if the initial attempt failed, try to configure the gadget again with the resetUsb flag
+	return u.WithTransaction(f(true, resetUsb))
 }

jsonrpc.go

@@ -678,7 +678,7 @@ func rpcSetUsbConfig(usbConfig usbgadget.Config) error {
 	LoadConfig()
 	config.UsbConfig = &usbConfig
 	gadget.SetGadgetConfig(config.UsbConfig)
-	return updateUsbRelatedConfig()
+	return updateUsbRelatedConfig(false)
 }
 
 func rpcGetWakeOnLanDevices() ([]WakeOnLanDevice, error) {
@@ -890,8 +890,8 @@ func rpcGetUsbDevices() (usbgadget.Devices, error) {
 	return *config.UsbDevices, nil
 }
 
-func updateUsbRelatedConfig() error {
+func updateUsbRelatedConfig(resetUsbIfNeeded bool) error {
-	if err := gadget.UpdateGadgetConfig(); err != nil {
+	if err := gadget.UpdateGadgetConfig(resetUsbIfNeeded); err != nil {
 		return fmt.Errorf("failed to write gadget config: %w", err)
 	}
 	if err := SaveConfig(); err != nil {
@@ -903,7 +903,7 @@ func updateUsbRelatedConfig() error {
 func rpcSetUsbDevices(usbDevices usbgadget.Devices) error {
 	config.UsbDevices = &usbDevices
 	gadget.SetGadgetDevices(config.UsbDevices)
-	return updateUsbRelatedConfig()
+	return updateUsbRelatedConfig(false)
 }
 
 func rpcSetUsbDeviceState(device string, enabled bool) error {
@@ -920,7 +920,7 @@ func rpcSetUsbDeviceState(device string, enabled bool) error {
 		return fmt.Errorf("invalid device: %s", device)
 	}
 	gadget.SetGadgetDevices(config.UsbDevices)
-	return updateUsbRelatedConfig()
+	return updateUsbRelatedConfig(false)
 }
 
 func rpcSetCloudUrl(apiUrl string, appUrl string) error {

usb_mass_storage.go

@@ -66,7 +66,7 @@ func setMassStorageMode(cdrom bool) error {
 		return nil
 	}
 
-	return gadget.UpdateGadgetConfig()
+	return gadget.UpdateGadgetConfig(true)
 }
 
 func mountImage(imagePath string) error {