From: Tollef Fog Heen <tfheen@err.no>
Date: Sat, 20 Nov 2010 07:56:54 +0000 (+0100)
Subject: Merge branch 'master' into debian
X-Git-Tag: 16-1~35
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c9149c325656ced0d0db93073ac080a19cae27d1;p=systemd

Merge branch 'master' into debian

Conflicts:
	units/var-lock.mount
---

c9149c325656ced0d0db93073ac080a19cae27d1
diff --cc units/var-lock.mount
index 6f5d15bc,0ea2599b..bd5b8e3f
--- a/units/var-lock.mount
+++ b/units/var-lock.mount
@@@ -13,4 -13,4 +13,4 @@@ Before=local-fs.targe
  What=tmpfs
  Where=/var/lock
  Type=tmpfs
- Options=mode=1775
 -Options=mode=775,gid=lock,nosuid,nodev,noexec
++Options=mode=1775,nosuid,nodev,noexec