Clean up /tmp/ directory again

In 219, upstream's tmpfiles.d/tmp.conf changed /tmp/ from 'd' to 'v', but there
is no 'V' counterpart to 'D'. So change it back.

Closes: #779169
LP: #1424992

diff --git a/debian/changelog b/debian/changelog
index 2311ac1439babf53feec5caf60e159b46cc10858..e1021af00f653a46c6a99d64d826431826dd684d 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -13,6 +13,7 @@ systemd (219-4) UNRELEASED; urgency=medium
     also under Ubuntu 15.04.
   * boot-and-services autopkgtest: Check cleanup of temporary files during
     boot. Reproduces #779169.
+  * Clean up /tmp/ directory again. (Closes: #779169, LP: #1424992)
 
  -- Martin Pitt <mpitt@debian.org>  Tue, 24 Feb 2015 08:31:29 +0100
 

diff --git a/debian/patches/Bring-tmpfiles.d-tmp.conf-in-line-with-Debian-defaul.patch b/debian/patches/Bring-tmpfiles.d-tmp.conf-in-line-with-Debian-defaul.patch
index a84069452b034dd20787a5e0a8da9ba664ab4100..3822c167de32e8fe59bf7df16c3ea9038866b1c2 100644 (file)
--- a/debian/patches/Bring-tmpfiles.d-tmp.conf-in-line-with-Debian-defaul.patch
+++ b/debian/patches/Bring-tmpfiles.d-tmp.conf-in-line-with-Debian-defaul.patch
@@ -17,7 +17,7 @@ index ffdd82f..6d92bc3 100644
  # Clear tmp directories separately, to make them easier to override
 -v /tmp 1777 root root 10d
 -v /var/tmp 1777 root root 30d
-+v /tmp 1777 root root -
++D /tmp 1777 root root -
 +#v /var/tmp 1777 root root 30d
  
  # Exclude namespace mountpoints created with PrivateTmp=yes