summaryrefslogtreecommitdiffstats
path: root/projectroot
diff options
context:
space:
mode:
authorMichael Olbrich <m.olbrich@pengutronix.de>2017-01-11 15:04:36 +0100
committerMichael Olbrich <m.olbrich@pengutronix.de>2017-04-11 11:21:55 +0200
commit73ccb178820e7d74632cfcc511256c7032ae230e (patch)
tree034faf7623ec360d7424c9a9f816304a2965f904 /projectroot
parentb6140ddc07386e0279ee603a5471b0b0b2749ee5 (diff)
downloadptxdist-73ccb178820e7d74632cfcc511256c7032ae230e.tar.gz
ptxdist-73ccb178820e7d74632cfcc511256c7032ae230e.tar.xz
nginx: /usr merge
Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
Diffstat (limited to 'projectroot')
-rw-r--r--projectroot/usr/lib/systemd/system/nginx.service (renamed from projectroot/lib/systemd/system/nginx.service)0
-rw-r--r--projectroot/usr/lib/systemd/system/rpcbind.socket (renamed from projectroot/lib/systemd/system/rpcbind.socket)0
2 files changed, 0 insertions, 0 deletions
diff --git a/projectroot/lib/systemd/system/nginx.service b/projectroot/usr/lib/systemd/system/nginx.service
index a6a1a4d70..a6a1a4d70 100644
--- a/projectroot/lib/systemd/system/nginx.service
+++ b/projectroot/usr/lib/systemd/system/nginx.service
diff --git a/projectroot/lib/systemd/system/rpcbind.socket b/projectroot/usr/lib/systemd/system/rpcbind.socket
index d43cc75df..d43cc75df 100644
--- a/projectroot/lib/systemd/system/rpcbind.socket
+++ b/projectroot/usr/lib/systemd/system/rpcbind.socket