Commit fead8426 authored by Jon Severinsson's avatar Jon Severinsson
Browse files

Map some rcS.d init script dependencies to their systemd equivalent.

parent 3f3b71a9
......@@ -6,6 +6,7 @@ systemd (208-7) UNRELEASED; urgency=medium
[ Jon Severinsson ]
* Cherry-pick upstream fix for journal file permissions.
* Map some rcS.d init script dependencies to their systemd equivalent.
[ Martin Pitt ]
* Rename "api" autopkgtest to "build-login", and stop requiring that
......
From: Jon Severinsson <jon@severinsson.net>
Date: Fri, 11 Jul 2014 02:15:37 +0200
Subject: Map rcS.d init script dependencies to their systemd equivalent.
---
src/core/service.c | 6 ++++++
1 file changed, 6 insertions(+)
diff --git a/src/core/service.c b/src/core/service.c
index dda34a7..b3f48b4 100644
--- a/src/core/service.c
+++ b/src/core/service.c
@@ -370,6 +370,12 @@ static int sysv_translate_facility(const char *name, const char *filename, char
"remote_fs", SPECIAL_REMOTE_FS_TARGET,
"syslog", SPECIAL_SYSLOG_TARGET,
"time", SPECIAL_TIME_SYNC_TARGET,
+ /* special rcS init scripts */
+ "cryptdisks", "cryptsetup.target",
+ "mountall", SPECIAL_LOCAL_FS_TARGET,
+ "mountnfs", SPECIAL_REMOTE_FS_TARGET,
+ "checkroot", "systemd-remount-fs.service",
+ "dbus", "dbus.socket",
};
unsigned i;
......@@ -520,3 +520,4 @@ Adjust-systemd-user-pam-config-file-for-Debian.patch
Add-run-initctl-support-to-SysV-compat-tools.patch
core-transaction-fix-cycle-break-attempts-outside-tr.patch
tmpfiles-don-t-allow-read-access-to-journal-files-to.patch
Map-rcS.d-init-script-dependencies-to-their-systemd-.patch
......@@ -46,11 +46,7 @@
/dev/null /lib/systemd/system/umountnfs.service
/dev/null /lib/systemd/system/umountroot.service
/dev/null /lib/systemd/system/checkfs.service
# We need checkroot as synchronisation point for LSB/SysV init scripts,
# so symlink it to remount-rootfs
/lib/systemd/system/systemd-remount-fs.service /lib/systemd/system/checkroot.service
# checkroot-bootclean cleans up directories before mounting a tmpfs
# over it. As systemd handles mounts differently, mask this service.
/dev/null /lib/systemd/system/checkroot.service
/dev/null /lib/systemd/system/checkroot-bootclean.service
# We use the built-in cryptsetup support
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment