Skip to content

Commit 79d814e

Browse files
committed
live-patch-1: fix Docker install
1 parent 764a28f commit 79d814e

File tree

1 file changed

+13
-3
lines changed

1 file changed

+13
-3
lines changed

.update/version

Lines changed: 13 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,17 @@ G_MIN_DEBIAN=6
1414
# Alternative Git branch to automatically migrate to when Debian version is too low
1515
G_OLD_DEBIAN_BRANCH='8'
1616
# Live patches
17-
G_LIVE_PATCH_DESC=('Fix Redis, Syncthing, and IPFS Node installs on container systems')
17+
G_LIVE_PATCH_DESC=(
18+
[0]='Fix Redis, Syncthing, and IPFS Node installs on container systems'
19+
[1]='Fix Docker installation'
20+
)
1821
# shellcheck disable=SC2016
19-
G_LIVE_PATCH_COND=('(( $G_HW_MODEL == 75 ))')
20-
G_LIVE_PATCH=('sed -i '\''/^[[:blank:]]*G_EXEC sysctl /d'\'' /boot/dietpi/dietpi-software')
22+
G_LIVE_PATCH_COND=(
23+
[0]='(( $G_HW_MODEL == 75 )) && grep -q '\''^[[:blank:]]*G_EXEC sysctl '\'' /boot/dietpi/dietpi-software'
24+
[1]='(( $G_HW_ARCH != 11 )) && grep -q '\''linux/\$distro/gpg'\'' /boot/dietpi/dietpi-software'
25+
)
26+
# shellcheck disable=SC2016
27+
G_LIVE_PATCH=(
28+
[0]='sed --follow-symlinks -i '\''/^[[:blank:]]*G_EXEC sysctl /d'\'' /boot/dietpi/dietpi-software'
29+
[1]='sed --follow-symlinks -i '\''s|linux/\$distro/gpg|linux/\${distro%% *}/gpg|'\'' /boot/dietpi/dietpi-software'
30+
)

0 commit comments

Comments
 (0)