Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: sailfishos/usb-moded
base: 34b203d4645c5f718cbbf7bd4a64e40fbca6a556
Choose a base ref
...
head repository: sailfishos/usb-moded
compare: a26b99f0b107f9c1d8d1018221ffaa7db74a83f9
Choose a head ref
  • 6 commits
  • 8 files changed
  • 1 contributor

Commits on Sep 24, 2020

  1. [build] Update header dependencies

    Apparently was forgotten at some stage. Rectify the situation.
    
    Signed-off-by: Simo Piiroinen <simo.piiroinen@jollamobile.com>
    spiiroin committed Sep 24, 2020
    Copy the full SHA
    ee9bc36 View commit details
    Browse the repository at this point in the history
  2. [build] Make configure-less build work with dbus-gmain submodule

    Adjust pkg-config package list, use dbus-gmain.c from submodule.
    
    Signed-off-by: Simo Piiroinen <simo.piiroinen@jollamobile.com>
    spiiroin committed Sep 24, 2020
    Copy the full SHA
    2714331 View commit details
    Browse the repository at this point in the history
  3. [usb-moded] Make diagnostic mode selection permanent. JB#38342

    Different config files must be used when diagnostic mode is
    selected. In practice diagnostic mode selection is locked early
    on during usb-moded startup and never changes. But as long as it
    is possible, it would need to be taken into account in situations
    where configuration files need to be re-evaluated.
    
    Make it impossible to change diagnostic mode selection once it
    has been made.
    
    Signed-off-by: Simo Piiroinen <simo.piiroinen@jollamobile.com>
    spiiroin committed Sep 24, 2020
    Copy the full SHA
    3888e4d View commit details
    Browse the repository at this point in the history
  4. [appsync] Use global diag mode state for config dir selection. JB#38342

    Selection of diagnostic mode is made once during lifetime of usb-moded
    process. Passing it around as parameter can only lead to confusion.
    
    Make it so that appsync_read_list() reads configuration files from
    directory determined from globally defined diagnostic mode selection
    rather than from parameter passed to it.
    
    Use glob pattern for determining list of files to read. As a side effect
    this stops usb-moded from reading all files (e.g. editor backup files
    accidentally left behind) which could lead into obscure and hard to
    figure out problems.
    
    Signed-off-by: Simo Piiroinen <simo.piiroinen@jollamobile.com>
    spiiroin committed Sep 24, 2020
    Copy the full SHA
    89ae6e9 View commit details
    Browse the repository at this point in the history
  5. [appsync] Reload appsync configuration on SIGHUP. Fixes JB#38342

    Developer mode does not work immediately after installing related
    packages. Developer mode does become available for selecting, but
    it does not work as expected because dhcpd is not started on
    activation.
    
    This is because usb-moded fails to reload appsync configuration
    upon receiving SIGHUP and previous configuration state stays
    effective until usb-moded is restarted (or device rebooted).
    
    As appsync config contains state data that is used in worker
    thread, existing configuration can't be just discarded and
    replaced when processing SIGHUP from control thread.
    
    Refactor appsync logic so that it keeps track of both active and
    updated configuration. Load updated configuration on SIGHUP. Then
    switch active configuration on the next mode transition - so that
    the previous state is retained while it might be needed.
    
    Signed-off-by: Simo Piiroinen <simo.piiroinen@jollamobile.com>
    spiiroin committed Sep 24, 2020
    Copy the full SHA
    4899b85 View commit details
    Browse the repository at this point in the history

Commits on Sep 25, 2020

  1. Merge branch 'jb38342_config_reload' into 'master'

    Reload appsync configuration on SIGHUP
    
    See merge request mer-core/usb-moded!70
    spiiroin committed Sep 25, 2020
    Copy the full SHA
    a26b99f View commit details
    Browse the repository at this point in the history