Spotter-Cluster/Spotter-VM
2
0
Fork 0
Code Issues 78 Pull Requests Actions Packages Projects Releases Wiki Activity

Have Docker start cgroups as dependency

Browse Source 
Reverts commit 5a0a00f296.
This commit is contained in:
Disassembler 2018-07-15 19:02:40 +02:00
parent b4db5a5b78
commit 1c2d9c4124
No known key found for this signature in database
GPG Key ID: 524BD33A0EE29499
2 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
alpine.sh
View File

@ -65,10 +65,9 @@ setup-disk -m sys /mnt
# Update boot-time volume information # Update boot-time volume information
BOOT_UUID=$(blkid /dev/sda1 | cut -d' ' -f2 | tr -d '"') BOOT_UUID=$(blkid /dev/sda1 | cut -d' ' -f2 | tr -d '"')
cat <<EOF >/mnt/etc/fstab cat <<EOF >/mnt/etc/fstab
/dev/vg0/root / ext4 rw,noatime,data=ordered 0 1 /dev/vg0/root / ext4 rw,noatime,data=ordered 0 1
${BOOT_UUID} /boot ext4 rw,noatime,data=ordered 0 2 ${BOOT_UUID} /boot ext4 rw,noatime,data=ordered 0 2
/dev/vg0/swap swap swap defaults 0 0 /dev/vg0/swap swap swap defaults 0 0
cgroup /sys/fs/cgroup cgroup defaults 0 0
EOF EOF
echo "system /dev/sda2 none luks" >/mnt/etc/crypttab echo "system /dev/sda2 none luks" >/mnt/etc/crypttab

2
basic/etc/init.d/docker
View File

@ -14,7 +14,7 @@ start_stop_daemon_args="--background \
grsecdir=/proc/sys/kernel/grsecurity grsecdir=/proc/sys/kernel/grsecurity
depend() { depend() {
need sysfs need sysfs cgroups
} }
start_pre() { start_pre() {