summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--package/mender/mender.mk3
-rw-r--r--package/mender/mender.service1
-rw-r--r--package/mender/tenant.conf0
3 files changed, 1 insertions, 3 deletions
diff --git a/package/mender/mender.mk b/package/mender/mender.mk
index a90ca3d2a8..a7ae1d388a 100644
--- a/package/mender/mender.mk
+++ b/package/mender/mender.mk
@@ -13,8 +13,7 @@ define MENDER_INSTALL_CONFIG_FILES
$(INSTALL) -D -m 0644 package/mender/mender.conf \
$(TARGET_DIR)/etc/mender/mender.conf
- $(INSTALL) -D -m 0644 package/mender/tenant.conf \
- $(TARGET_DIR)/etc/mender/tenant.conf
+
$(INSTALL) -D -m 0644 package/mender/server.crt \
$(TARGET_DIR)/etc/mender/server.crt
diff --git a/package/mender/mender.service b/package/mender/mender.service
index ec77fbc46c..9ede55acb5 100644
--- a/package/mender/mender.service
+++ b/package/mender/mender.service
@@ -7,7 +7,6 @@ Type=idle
User=root
Group=root
ExecStartPre=/bin/mkdir -p -m 0700 /data/mender
-ExecStartPre=/bin/ln -sf /etc/mender/tenant.conf /var/lib/mender/authtentoken
ExecStart=/usr/bin/mender -daemon
Restart=on-abort
diff --git a/package/mender/tenant.conf b/package/mender/tenant.conf
deleted file mode 100644
index e69de29bb2..0000000000
--- a/package/mender/tenant.conf
+++ /dev/null
OpenPOWER on IntegriCloud