summaryrefslogtreecommitdiffstats
path: root/projectroot
diff options
context:
space:
mode:
authorMichael Olbrich <m.olbrich@pengutronix.de>2017-01-11 15:04:24 +0100
committerMichael Olbrich <m.olbrich@pengutronix.de>2017-04-11 11:21:36 +0200
commitdc1ee3c1d8d1231493370300bd0a2734de05a40c (patch)
treea2d3b51bb9979c467d48c11745a7dd11fb83167e /projectroot
parent635989bbb2baff0324d2147ce0cdd021b62809e8 (diff)
downloadptxdist-dc1ee3c1d8d1231493370300bd0a2734de05a40c.tar.gz
ptxdist-dc1ee3c1d8d1231493370300bd0a2734de05a40c.tar.xz
pureftpd: /usr merge
Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
Diffstat (limited to 'projectroot')
-rw-r--r--projectroot/usr/lib/systemd/system/pure-ftpd.socket (renamed from projectroot/lib/systemd/system/pure-ftpd.socket)0
-rw-r--r--projectroot/usr/lib/systemd/system/pure-ftpd@.service (renamed from projectroot/lib/systemd/system/pure-ftpd@.service)0
-rw-r--r--projectroot/usr/lib/systemd/system/pure-uploadscript.service (renamed from projectroot/lib/systemd/system/pure-uploadscript.service)0
3 files changed, 0 insertions, 0 deletions
diff --git a/projectroot/lib/systemd/system/pure-ftpd.socket b/projectroot/usr/lib/systemd/system/pure-ftpd.socket
index 1883b579f..1883b579f 100644
--- a/projectroot/lib/systemd/system/pure-ftpd.socket
+++ b/projectroot/usr/lib/systemd/system/pure-ftpd.socket
diff --git a/projectroot/lib/systemd/system/pure-ftpd@.service b/projectroot/usr/lib/systemd/system/pure-ftpd@.service
index b7f086731..b7f086731 100644
--- a/projectroot/lib/systemd/system/pure-ftpd@.service
+++ b/projectroot/usr/lib/systemd/system/pure-ftpd@.service
diff --git a/projectroot/lib/systemd/system/pure-uploadscript.service b/projectroot/usr/lib/systemd/system/pure-uploadscript.service
index 9cdbebc07..9cdbebc07 100644
--- a/projectroot/lib/systemd/system/pure-uploadscript.service
+++ b/projectroot/usr/lib/systemd/system/pure-uploadscript.service