summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Olbrich <m.olbrich@pengutronix.de>2011-09-23 23:12:42 +0200
committerMichael Olbrich <m.olbrich@pengutronix.de>2011-09-23 23:13:37 +0200
commit38bfdbcb71ab4c8ab845851f5a09e8966b527005 (patch)
treec4bce9c24e84ae46bee2aa2d767d7e6e998118f5
parent869c9107404d6976442ea3f2e3fac44727e617e4 (diff)
downloadptxdist-38bfdbcb71ab4c8ab845851f5a09e8966b527005.tar.gz
ptxdist-38bfdbcb71ab4c8ab845851f5a09e8966b527005.tar.xz
systemd: version bump 35 -> 36
... and remove the now unnecessary hack from sshd@.service Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
-rw-r--r--generic/lib/systemd/system/sshd@.service1
-rw-r--r--rules/systemd.make4
2 files changed, 2 insertions, 3 deletions
diff --git a/generic/lib/systemd/system/sshd@.service b/generic/lib/systemd/system/sshd@.service
index 0ed471fe5..b81d47103 100644
--- a/generic/lib/systemd/system/sshd@.service
+++ b/generic/lib/systemd/system/sshd@.service
@@ -5,4 +5,3 @@ After=syslog.target
[Service]
ExecStart=/usr/sbin/sshd -i
StandardInput=socket
-StandardOutput=inherit
diff --git a/rules/systemd.make b/rules/systemd.make
index 0f6ccd772..efca2d166 100644
--- a/rules/systemd.make
+++ b/rules/systemd.make
@@ -16,8 +16,8 @@ PACKAGES-$(PTXCONF_SYSTEMD) += systemd
#
# Paths and names
#
-SYSTEMD_VERSION := 35
-SYSTEMD_MD5 := 6b37b385d22f28c184a04a4e6c3c69b4
+SYSTEMD_VERSION := 36
+SYSTEMD_MD5 := e1213338efb697abc8215d9a66a7f082
SYSTEMD := systemd-$(SYSTEMD_VERSION)
SYSTEMD_SUFFIX := tar.bz2
SYSTEMD_URL := http://www.freedesktop.org/software/systemd/$(SYSTEMD).$(SYSTEMD_SUFFIX)