Keep cgroups initscript and rewrite rules in regex.
Add after mountkernfs dependency for Debian, and add cgroups to
runlevel sysinit.
Closes: https://bugs.debian.org/960183
Benda Xu
3 years ago
56 | 56 |
done
|
57 | 57 |
|
58 | 58 |
rc-update add savecache off
|
|
59 |
rc-update add cgroups sysinit
|
59 | 60 |
rc-update -u
|
60 | 61 |
|
61 | 62 |
if [ "$dsvcs" != "" ]; then
|
|
0 |
From: Benda Xu <heroxbd@gentoo.org>
|
|
1 |
Date: Fri, 15 May 2020 15:49:40 +0800
|
|
2 |
Subject: cgroups after mountkernfs
|
|
3 |
|
|
4 |
Description: cgroups starts after sysfs, named mountkernfs in Debian.
|
|
5 |
Forwarded: not-needed
|
|
6 |
---
|
|
7 |
init.d/cgroups.in | 2 +-
|
|
8 |
1 file changed, 1 insertion(+), 1 deletion(-)
|
|
9 |
|
|
10 |
diff --git a/init.d/cgroups.in b/init.d/cgroups.in
|
|
11 |
index 3d5bfa7..d421944 100644
|
|
12 |
--- a/init.d/cgroups.in
|
|
13 |
+++ b/init.d/cgroups.in
|
|
14 |
@@ -16,7 +16,7 @@ cgroup_opts=nodev,noexec,nosuid
|
|
15 |
depend()
|
|
16 |
{
|
|
17 |
keyword -docker -prefix -systemd-nspawn -vserver
|
|
18 |
- after sysfs
|
|
19 |
+ after sysfs mountkernfs
|
|
20 |
}
|
|
21 |
|
|
22 |
cgroup1_base()
|
2 | 2 |
0003-dependency-loop-resolver.patch
|
3 | 3 |
0004-consider-initd-shebangs.patch
|
4 | 4 |
0009-insserv-warning.patch
|
|
5 |
0010-cgroups-after-mountkernfs.patch
|
66 | 66 |
rm -rf $(CURDIR)/debian/openrc/etc/$${i} ; \
|
67 | 67 |
done
|
68 | 68 |
|
69 | |
# We don't want the Gentoo init scripts, but only want savecache to stay
|
70 | |
find $(CURDIR)/debian/openrc/etc/init.d/* -name savecache -or -name rc -or -name rcS -prune -o -exec rm -f {} +
|
|
69 |
# We don't want the Gentoo init scripts, but only want savecache and cgroups to stay #960183
|
|
70 |
find $(CURDIR)/debian/openrc/etc/init.d/* \
|
|
71 |
\! -type d \! -regex ".*/\(savecache\|cgroups\|rcS?\)" -delete
|
71 | 72 |
|
72 | 73 |
for dir in boot default sysinit shutdown; do \
|
73 | 74 |
rm -f $(CURDIR)/debian/openrc/etc/runlevels/$${dir}/* ; \
|