Move the debianisation of upstream files into its own branch

diff --git a/tmpfiles.d/legacy.conf b/tmpfiles.d/legacy.conf
index 9198e89dd1097cfe365d340351c8e50b15f704ab..c357b189734192de26d559750340bc302ec9eb59 100644 (file)
--- a/tmpfiles.d/legacy.conf
+++ b/tmpfiles.d/legacy.conf
@@ -17,6 +17,6 @@
 # On modern systems a BSD file lock is a better choice if
 # serialization is needed on those devices.
 
-d /run/lock 0755 root root -
+d /run/lock 1777 root root -
 d /run/lock/subsys 0755 root root -
-d /run/lock/lockdev 0775 root lock -
+d /run/lock/lockdev 0775 root root -

diff --git a/units/getty@.service.m4 b/units/getty@.service.m4
index b1115672bb99026240ffd68a2051d9f66ff27439..ea807841440b8dbdd2bf3784dd202942c660fd14 100644 (file)
--- a/units/getty@.service.m4
+++ b/units/getty@.service.m4
@@ -8,7 +8,7 @@
 [Unit]
 Description=Getty on %I
 BindTo=dev-%i.device
-After=dev-%i.device systemd-user-sessions.service plymouth-quit-wait.service
+After=dev-%i.device systemd-user-sessions.service plymouth-quit-wait.service openvpn.service apache2.service
 m4_ifdef(`TARGET_FEDORA',
 After=rc-local.service
 )m4_dnl

diff --git a/units/remote-fs.target b/units/remote-fs.target
index a48f87e5ddee2896abaca5524f7cccc7b5a435ae..61920d8f04bbc9179449fe442b476cc86a79e26c 100644 (file)
--- a/units/remote-fs.target
+++ b/units/remote-fs.target
@@ -9,6 +9,7 @@
 
 [Unit]
 Description=Remote File Systems
+After=local-fs.target
 
 [Install]
 WantedBy=multi-user.target

diff --git a/units/remount-rootfs.service b/units/remount-rootfs.service
index e95023f03d5bd2b5bf87519d057241c77991915c..6dbcaeb701091ecea9803f920193688396ae4773 100644 (file)
--- a/units/remount-rootfs.service
+++ b/units/remount-rootfs.service
@@ -10,7 +10,7 @@ Description=Remount Root FS
 DefaultDependencies=no
 Conflicts=shutdown.target
 After=systemd-readahead-collect.service systemd-readahead-replay.service fsck-root.service
-Before=local-fs.target shutdown.target
+Before=local-fs.target shutdown.target mountoverflowtmp.service
 
 [Service]
 Type=oneshot