From 1c2d9c4124084b6926c3abb84cd020a367385fdf Mon Sep 17 00:00:00 2001 From: Disassembler Date: Sun, 15 Jul 2018 19:02:40 +0200 Subject: [PATCH] Have Docker start cgroups as dependency Reverts commit 5a0a00f296c37f6be8897b0133c18ba1f121dea9. --- alpine.sh | 7 +++---- basic/etc/init.d/docker | 2 +- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/alpine.sh b/alpine.sh index 56afb21..a19ec3b 100755 --- a/alpine.sh +++ b/alpine.sh @@ -65,10 +65,9 @@ setup-disk -m sys /mnt # Update boot-time volume information BOOT_UUID=$(blkid /dev/sda1 | cut -d' ' -f2 | tr -d '"') cat </mnt/etc/fstab -/dev/vg0/root / ext4 rw,noatime,data=ordered 0 1 -${BOOT_UUID} /boot ext4 rw,noatime,data=ordered 0 2 -/dev/vg0/swap swap swap defaults 0 0 -cgroup /sys/fs/cgroup cgroup defaults 0 0 +/dev/vg0/root / ext4 rw,noatime,data=ordered 0 1 +${BOOT_UUID} /boot ext4 rw,noatime,data=ordered 0 2 +/dev/vg0/swap swap swap defaults 0 0 EOF echo "system /dev/sda2 none luks" >/mnt/etc/crypttab diff --git a/basic/etc/init.d/docker b/basic/etc/init.d/docker index cbd9a86..b78a24f 100755 --- a/basic/etc/init.d/docker +++ b/basic/etc/init.d/docker @@ -14,7 +14,7 @@ start_stop_daemon_args="--background \ grsecdir=/proc/sys/kernel/grsecurity depend() { - need sysfs + need sysfs cgroups } start_pre() {