github.com/kaisenlinux/docker.io@v0.0.0-20230510090727-ea55db55fac7/debian/patches/debian-cgroupfs-mount-convenience-copy.patch (about)

     1  Author: Tianon Gravi <admwiggin@gmail.com>
     2  Description: remove convenience copies of cgroupfs-mount in init.d / upstart
     3  Forwarded: not-needed
     4  Bug-Debian: https://bugs.debian.org/783143
     5  
     6  Index: docker/engine/contrib/init/sysvinit-debian/docker
     7  ===================================================================
     8  --- docker.orig/engine/contrib/init/sysvinit-debian/docker
     9  +++ docker/engine/contrib/init/sysvinit-debian/docker
    10  @@ -59,37 +59,12 @@ fail_unless_root() {
    11   	fi
    12   }
    13   
    14  -cgroupfs_mount() {
    15  -	# see also https://github.com/tianon/cgroupfs-mount/blob/master/cgroupfs-mount
    16  -	if grep -v '^#' /etc/fstab | grep -q cgroup \
    17  -		|| [ ! -e /proc/cgroups ] \
    18  -		|| [ ! -d /sys/fs/cgroup ]; then
    19  -		return
    20  -	fi
    21  -	if ! mountpoint -q /sys/fs/cgroup; then
    22  -		mount -t tmpfs -o uid=0,gid=0,mode=0755 cgroup /sys/fs/cgroup
    23  -	fi
    24  -	(
    25  -		cd /sys/fs/cgroup
    26  -		for sys in $(awk '!/^#/ { if ($4 == 1) print $1 }' /proc/cgroups); do
    27  -			mkdir -p $sys
    28  -			if ! mountpoint -q $sys; then
    29  -				if ! mount -n -t cgroup -o $sys cgroup $sys; then
    30  -					rmdir $sys || true
    31  -				fi
    32  -			fi
    33  -		done
    34  -	)
    35  -}
    36  -
    37   case "$1" in
    38   	start)
    39   		check_init
    40   
    41   		fail_unless_root
    42   
    43  -		cgroupfs_mount
    44  -
    45   		touch "$DOCKER_LOGFILE"
    46   		chgrp docker "$DOCKER_LOGFILE"
    47   
    48  Index: docker/engine/contrib/init/upstart/docker.conf
    49  ===================================================================
    50  --- docker.orig/engine/contrib/init/upstart/docker.conf
    51  +++ docker/engine/contrib/init/upstart/docker.conf
    52  @@ -13,29 +13,6 @@ respawn
    53   
    54   kill timeout 20
    55   
    56  -pre-start script
    57  -	# see also https://github.com/tianon/cgroupfs-mount/blob/master/cgroupfs-mount
    58  -	if grep -v '^#' /etc/fstab | grep -q cgroup \
    59  -		|| [ ! -e /proc/cgroups ] \
    60  -		|| [ ! -d /sys/fs/cgroup ]; then
    61  -		exit 0
    62  -	fi
    63  -	if ! mountpoint -q /sys/fs/cgroup; then
    64  -		mount -t tmpfs -o uid=0,gid=0,mode=0755 cgroup /sys/fs/cgroup
    65  -	fi
    66  -	(
    67  -		cd /sys/fs/cgroup
    68  -		for sys in $(awk '!/^#/ { if ($4 == 1) print $1 }' /proc/cgroups); do
    69  -			mkdir -p $sys
    70  -			if ! mountpoint -q $sys; then
    71  -				if ! mount -n -t cgroup -o $sys cgroup $sys; then
    72  -					rmdir $sys || true
    73  -				fi
    74  -			fi
    75  -		done
    76  -	)
    77  -end script
    78  -
    79   script
    80   	# modify these in /etc/default/$UPSTART_JOB (/etc/default/docker)
    81   	DOCKERD=/usr/sbin/dockerd