Skip to content
Permalink
Browse files
[systemd] Allow passing optional adaptation args for usb-moded. JB#34547
Systemd environment files can't be used to accumulate values and the
existing $USB_MODED_ARGS is already used for the purposes of optional
rescue mode.

Use separate $USB_MODED_HW_ADAPTATION_ARGS to allow passing hw adaptation
specific command line options to usb-moded.

Additionally remove the '-a' argument from default command line parameters
as it can now be handled in adaptation config only for those devices that
actually need it.

Signed-off-by: Simo Piiroinen <simo.piiroinen@jollamobile.com>
  • Loading branch information
spiiroin committed Apr 26, 2016
1 parent c982d3b commit e92c69c9e02a6ecec3920791134032d871e940da
Showing with 1 addition and 1 deletion.
  1. +1 −1 systemd/usb-moded.service
@@ -11,7 +11,7 @@ Type=notify
TimeoutSec=15
EnvironmentFile=-/var/lib/environment/usb-moded/*.conf
EnvironmentFile=-/run/usb-moded/*.conf
ExecStart=/usr/sbin/usb_moded --systemd -a --force-syslog $USB_MODED_ARGS
ExecStart=/usr/sbin/usb_moded --systemd --force-syslog $USB_MODED_ARGS $USB_MODED_HW_ADAPTATION_ARGS
Restart=always
ExecReload=/bin/kill -HUP $MAINPID
BusName=com.meego.usb_moded

0 comments on commit e92c69c

Please sign in to comment.