summaryrefslogtreecommitdiffstats
path: root/projectroot
diff options
context:
space:
mode:
authorMichael Olbrich <m.olbrich@pengutronix.de>2017-01-11 11:39:15 +0100
committerMichael Olbrich <m.olbrich@pengutronix.de>2017-04-11 11:19:55 +0200
commite6cb3372c01cd19a67f52eace782a1bb9b90d3bd (patch)
tree02bd798961a48052da8d1fc959176b7ad9b0bfc4 /projectroot
parent7927a359337d859b3f67228b5a0005f9ac86c799 (diff)
downloadptxdist-e6cb3372c01cd19a67f52eace782a1bb9b90d3bd.tar.gz
ptxdist-e6cb3372c01cd19a67f52eace782a1bb9b90d3bd.tar.xz
mysql: /usr merge
Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
Diffstat (limited to 'projectroot')
-rw-r--r--projectroot/usr/lib/systemd/system/mysqld.service (renamed from projectroot/lib/systemd/system/mysqld.service)0
-rw-r--r--projectroot/usr/lib/systemd/system/mysqldinit.service (renamed from projectroot/lib/systemd/system/mysqldinit.service)0
-rw-r--r--projectroot/usr/sbin/mysqlinit (renamed from projectroot/sbin/mysqlinit)0
3 files changed, 0 insertions, 0 deletions
diff --git a/projectroot/lib/systemd/system/mysqld.service b/projectroot/usr/lib/systemd/system/mysqld.service
index f92d49b90..f92d49b90 100644
--- a/projectroot/lib/systemd/system/mysqld.service
+++ b/projectroot/usr/lib/systemd/system/mysqld.service
diff --git a/projectroot/lib/systemd/system/mysqldinit.service b/projectroot/usr/lib/systemd/system/mysqldinit.service
index d7aefcc03..d7aefcc03 100644
--- a/projectroot/lib/systemd/system/mysqldinit.service
+++ b/projectroot/usr/lib/systemd/system/mysqldinit.service
diff --git a/projectroot/sbin/mysqlinit b/projectroot/usr/sbin/mysqlinit
index 72b6d1f10..72b6d1f10 100644
--- a/projectroot/sbin/mysqlinit
+++ b/projectroot/usr/sbin/mysqlinit