summaryrefslogtreecommitdiff
path: root/recipes-support/snapd/files/0004-data-systemd-don-t-fail-to-start-if-etc-environment-.patch
diff options
context:
space:
mode:
authorMarcel Ziswiler <marcel.ziswiler@toradex.com>2017-06-28 17:47:22 +0200
committerMarcel Ziswiler <marcel.ziswiler@toradex.com>2017-06-30 22:05:21 +0200
commitb3c490c9185d5c7b4dd5001a434a0d41b14ef084 (patch)
treed8aee5dc0b9955e17c9be3a5cb02b9d839ef5708 /recipes-support/snapd/files/0004-data-systemd-don-t-fail-to-start-if-etc-environment-.patch
parent2f1fb4271246cd1ad92ca2c059f09752720cb17d (diff)
snapd: copied from meta-snappy
https://github.com/morphis/meta-snappy/commit/f6df6a63756d9976bcccb5fefdbc64e5cc794c99 Signed-off-by: Marcel Ziswiler <marcel.ziswiler@toradex.com> Acked-by: Dominik Sliwa <dominik.sliwa@toradex.com>
Diffstat (limited to 'recipes-support/snapd/files/0004-data-systemd-don-t-fail-to-start-if-etc-environment-.patch')
-rw-r--r--recipes-support/snapd/files/0004-data-systemd-don-t-fail-to-start-if-etc-environment-.patch27
1 files changed, 27 insertions, 0 deletions
diff --git a/recipes-support/snapd/files/0004-data-systemd-don-t-fail-to-start-if-etc-environment-.patch b/recipes-support/snapd/files/0004-data-systemd-don-t-fail-to-start-if-etc-environment-.patch
new file mode 100644
index 0000000..a202745
--- /dev/null
+++ b/recipes-support/snapd/files/0004-data-systemd-don-t-fail-to-start-if-etc-environment-.patch
@@ -0,0 +1,27 @@
+From d5a4787c00900a0a637507c978b3fec13edaf34b Mon Sep 17 00:00:00 2001
+From: Simon Fels <simon.fels@canonical.com>
+Date: Mon, 1 Aug 2016 12:08:13 +0200
+Subject: [PATCH 4/4] data/systemd: don't fail to start if /etc/environment
+ does not exist
+
+On some systems /etc/environment is not available by default and
+should be prevent snapd from starting.
+---
+ data/systemd/snapd.service.in | 1 -
+ 1 file changed, 1 deletion(-)
+
+diff --git a/data/systemd/snapd.service.in b/data/systemd/snapd.service.in
+index 009e62e..35f083d 100644
+--- a/data/systemd/snapd.service.in
++++ b/data/systemd/snapd.service.in
+@@ -4,7 +4,6 @@ Requires=snapd.socket
+
+ [Service]
+ ExecStart=@libexecdir@/snapd/snapd
+-EnvironmentFile=@SNAPD_ENVIRONMENT_FILE@
+ Restart=always
+
+ [Install]
+--
+2.7.4
+