diff options
| author | Michael Olbrich <m.olbrich@pengutronix.de> | 2017-01-11 15:04:43 +0100 |
|---|---|---|
| committer | Michael Olbrich <m.olbrich@pengutronix.de> | 2017-04-11 11:21:58 +0200 |
| commit | 362e6471a2b39837c08ccb21efe3b68ecd82616e (patch) | |
| tree | f73b6001e11882a315df630a101fcd6363d26756 /projectroot | |
| parent | a7242dba71b87875995742c0caa80f842aa9f99a (diff) | |
| download | ptxdist-362e6471a2b39837c08ccb21efe3b68ecd82616e.tar.gz ptxdist-362e6471a2b39837c08ccb21efe3b68ecd82616e.tar.xz | |
connman: /usr merge
Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
Diffstat (limited to 'projectroot')
| -rwxr-xr-x | projectroot/usr/lib/systemd/connman-ignore (renamed from projectroot/lib/systemd/connman-ignore) | 0 | ||||
| -rw-r--r-- | projectroot/usr/lib/systemd/system/connman-ignore.service (renamed from projectroot/lib/systemd/system/connman-ignore.service) | 2 | ||||
| -rw-r--r-- | projectroot/usr/lib/systemd/system/connman.service (renamed from projectroot/lib/systemd/system/connman.service) | 0 |
3 files changed, 1 insertions, 1 deletions
diff --git a/projectroot/lib/systemd/connman-ignore b/projectroot/usr/lib/systemd/connman-ignore index fe72c5567..fe72c5567 100755 --- a/projectroot/lib/systemd/connman-ignore +++ b/projectroot/usr/lib/systemd/connman-ignore diff --git a/projectroot/lib/systemd/system/connman-ignore.service b/projectroot/usr/lib/systemd/system/connman-ignore.service index ac80f517c..b31df07fb 100644 --- a/projectroot/lib/systemd/system/connman-ignore.service +++ b/projectroot/usr/lib/systemd/system/connman-ignore.service @@ -6,7 +6,7 @@ ConditionPathExists=!/run/connman-ignore [Service] Type=oneshot RemainAfterExit=yes -ExecStart=/lib/systemd/connman-ignore +ExecStart=/usr/lib/systemd/connman-ignore [Install] WantedBy=connman.service diff --git a/projectroot/lib/systemd/system/connman.service b/projectroot/usr/lib/systemd/system/connman.service index 4353276b5..4353276b5 100644 --- a/projectroot/lib/systemd/system/connman.service +++ b/projectroot/usr/lib/systemd/system/connman.service |