Merge pull request #31 from ChuckPa/chuckpa/Docker

Correct cgroups v2 issue
This commit is contained in:
Chuck 2022-12-26 21:41:02 -05:00 committed by GitHub
commit d36f9e1bad
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -396,8 +396,11 @@ HostConfig() {
return 0 return 0
# Docker
elif [ "$(grep docker /proc/1/cgroup | wc -l)" -gt 0 ] || [ "$(grep 0::/ /proc/1/cgroup)" = "0::/" ]; then
# Docker (All main docker variants except binhex) # Docker (All main docker variants except binhex)
elif [ "$(grep docker /proc/1/cgroup | wc -l)" -gt 0 ] && [ -d "/config/Library/Application Support" ]; then if [ -d "/config/Library/Application Support" ]; then
PLEX_SQLITE="/usr/lib/plexmediaserver/Plex SQLite" PLEX_SQLITE="/usr/lib/plexmediaserver/Plex SQLite"
AppSuppDir="/config/Library/Application Support" AppSuppDir="/config/Library/Application Support"
@ -410,7 +413,7 @@ HostConfig() {
return 0 return 0
# BINHEX Plex container # BINHEX Plex container
elif [ "$(grep docker /proc/1/cgroup | wc -l)" -gt 0 ] && [ -d "/config/Plex Media Server" ]; then elif [ -d "/config/Plex Media Server" ]; then
PLEX_SQLITE="/usr/lib/plexmediaserver/Plex SQLite" PLEX_SQLITE="/usr/lib/plexmediaserver/Plex SQLite"
AppSuppDir="/config" AppSuppDir="/config"
@ -421,6 +424,8 @@ HostConfig() {
HostType="BINHEX" HostType="BINHEX"
return 0 return 0
fi
# Western Digital (OS5) # Western Digital (OS5)
elif [ -f /etc/system.conf ] && [ -d /mnt/HD/HD_a2/Nas_Prog/plexmediaserver ] && \ elif [ -f /etc/system.conf ] && [ -d /mnt/HD/HD_a2/Nas_Prog/plexmediaserver ] && \