summaryrefslogtreecommitdiffstats
path: root/projectroot
diff options
context:
space:
mode:
authorMichael Olbrich <m.olbrich@pengutronix.de>2017-01-11 11:43:18 +0100
committerMichael Olbrich <m.olbrich@pengutronix.de>2017-04-11 11:19:58 +0200
commitd27127994b1cb7e5291780ce4bfc07e665011dcc (patch)
tree62fd46eb97394144ca8594ad0e1b64094dad2eda /projectroot
parent001dd1deeda1051e94ccfd6ae726746bc370413f (diff)
downloadptxdist-d27127994b1cb7e5291780ce4bfc07e665011dcc.tar.gz
ptxdist-d27127994b1cb7e5291780ce4bfc07e665011dcc.tar.xz
networkmanager: /usr merge
Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
Diffstat (limited to 'projectroot')
-rw-r--r--projectroot/usr/lib/init/nm-unmanage.sh (renamed from projectroot/lib/init/nm-unmanage.sh)0
-rw-r--r--projectroot/usr/lib/systemd/system/NetworkManager-unmanage.service (renamed from projectroot/lib/systemd/system/NetworkManager-unmanage.service)0
-rw-r--r--projectroot/usr/lib/systemd/system/NetworkManager.service (renamed from projectroot/lib/systemd/system/NetworkManager.service)0
3 files changed, 0 insertions, 0 deletions
diff --git a/projectroot/lib/init/nm-unmanage.sh b/projectroot/usr/lib/init/nm-unmanage.sh
index c9944108d..c9944108d 100644
--- a/projectroot/lib/init/nm-unmanage.sh
+++ b/projectroot/usr/lib/init/nm-unmanage.sh
diff --git a/projectroot/lib/systemd/system/NetworkManager-unmanage.service b/projectroot/usr/lib/systemd/system/NetworkManager-unmanage.service
index 9e41dc562..9e41dc562 100644
--- a/projectroot/lib/systemd/system/NetworkManager-unmanage.service
+++ b/projectroot/usr/lib/systemd/system/NetworkManager-unmanage.service
diff --git a/projectroot/lib/systemd/system/NetworkManager.service b/projectroot/usr/lib/systemd/system/NetworkManager.service
index f41c8b4bc..f41c8b4bc 100644
--- a/projectroot/lib/systemd/system/NetworkManager.service
+++ b/projectroot/usr/lib/systemd/system/NetworkManager.service