Skip to content

Commit a5951ef

Browse files
committed
v8.2
- DietPi-Software | Resolved an issue on RPi where on repeating container platform installs, multiple "cgroup_enable=memory" entries were added to /boot/cmdline.txt. The duplicates are removed automatically on DietPi update, when present. Many thanks to @isarrider for reporting this issue: #5225
1 parent 0f3b288 commit a5951ef

File tree

3 files changed

+5
-1
lines changed

3 files changed

+5
-1
lines changed

.update/patches

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -650,6 +650,9 @@ Patch_8_2()
650650
{
651651
# Remove obsolete quotation from armbianEnv.txt
652652
[[ -f '/boot/armbianEnv.txt' ]] && grep -q '^[[:blank:]]*extraargs="' /boot/armbianEnv.txt && G_EXEC sed -ie 's/^[[:blank:]]*extraargs="[[:blank:]]*/^extraargs=/' -e 's/[[:blank:]]*"[[:blank:]]*$//' /boot/armbianEnv.txt
653+
654+
# RPi: Remove multiple cgroup_enable=memory entries from cmdline.txt: https://github.com/MichaIng/DietPi/issues/5225#issuecomment-1033056312
655+
[[ -f '/boot/cmdline.txt' ]] && while grep -q 'cgroup_enable=memory cgroup_enable=memory' /boot/cmdline.txt; do G_EXEC sed -i 's/cgroup_enable=memory cgroup_enable=memory/cgroup_enable=memory/g' /boot/cmdline.txt; done
653656
}
654657

655658
# v6.35 => v7 migration

CHANGELOG.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ v8.2
44
Changes:
55

66
Fixes:
7+
- DietPi-Software | Resolved an issue on RPi where on repeating container platform installs, multiple "cgroup_enable=memory" entries were added to /boot/cmdline.txt. The duplicates are removed automatically on DietPi update, when present. Many thanks to @isarrider for reporting this issue: https://github.com/MichaIng/DietPi/issues/5225
78
- DietPi-Software | Apache: Resolved an issue on fresh installs where the service failed to start due to a config file syntax error. Many thanks to @Camry2731 for reporting this issue: https://github.com/MichaIng/DietPi/issues/5248
89
- DietPi-Software | Nextcloud: Resolved an issue where the install on an over 2 GiB RAM system failed. Many thanks to @p4cm4n for reporting this issue: https://github.com/MichaIng/DietPi/issues/5251
910
- DietPi-Software | Folding@Home: Resolved an issue where reinstalls failed since a removed SysV service is tried to be stopped. Many thanks to @eyduh for reporting this issue: https://github.com/MichaIng/DietPi/issues/5255

dietpi/dietpi-software

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10371,7 +10371,7 @@ _EOF_
1037110371
# Enable memory cgroup
1037210372
if (( $G_HW_MODEL < 10 ))
1037310373
then
10374-
grep -Eq '(^|[[:blank]])cgroup_enable=memory([[:blank]]|$)' /boot/cmdline.txt || G_EXEC sed -i '/root=/s/[[:blank:]]*$/ cgroup_enable=memory/' /boot/cmdline.txt
10374+
grep -Eq '(^|[[:blank:]])cgroup_enable=memory([[:blank:]]|$)' /boot/cmdline.txt || G_EXEC sed -i '/root=/s/[[:blank:]]*$/ cgroup_enable=memory/' /boot/cmdline.txt
1037510375

1037610376
elif [[ -f '/boot/boot.scr' ]] && grep -q 'docker_optimizations' /boot/boot.scr
1037710377
then

0 commit comments

Comments
 (0)