Merge branch 'jb53356_backend_timeout' into 'master'

Allow longer delay at usb backend probing See merge request mer-core/usb-moded!76
sailfishos · Mar 2, 2021 · 8b86ea3 · 8b86ea3
2 parents 9c83acd + eb008de
commit 8b86ea3
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/src/usb_moded.c b/src/usb_moded.c
@@ -795,6 +795,10 @@ static bool usbmoded_init(void)
      * not be already in there when usb-moded starts up.
      * Retry few times unless init done is / gets reached
      * while waiting.
+     *
+     * Note that waiting here delays also systemd notification
+     * -> changes in wait time might require adjustemnts to
+     *    startup timeout value in usb-moded.service file.
      */
     for( int i = 10; ; ) {
         if( configfs_init() )
@@ -812,7 +816,7 @@ static bool usbmoded_init(void)
             break;
         }
 
-        common_msleep(1000);
+        common_msleep(2000);
     }
 
     /* Allow making systemd control ipc */

diff --git a/systemd/usb-moded.service b/systemd/usb-moded.service
@@ -8,7 +8,7 @@ Conflicts=shutdown.target
 
 [Service]
 Type=notify
-TimeoutSec=15
+TimeoutSec=25
 EnvironmentFile=-/var/lib/environment/usb-moded/*.conf
 EnvironmentFile=-/run/usb-moded/*.conf
 ExecStart=/usr/sbin/usb_moded --systemd --force-syslog $USB_MODED_ARGS $USB_MODED_HW_ADAPTATION_ARGS