Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Beta v7.7.0 #4819

Merged
merged 63 commits into from
Oct 9, 2021
Merged
Changes from 1 commit
Commits
Show all changes
63 commits
Select commit Hold shift + click to select a range
140fa04
Live patch 0 v7.5 (#4696)
MichaIng Aug 29, 2021
c678b71
Release v7.6 (#4747)
MichaIng Sep 18, 2021
4f70b4c
Init v7.7
MichaIng Sep 21, 2021
5f1f73b
v7.7 (#4763)
MichaIng Sep 21, 2021
42d1bd3
v7.7
MichaIng Sep 21, 2021
ae86046
v7.7
MichaIng Sep 21, 2021
f97183e
v7.7
MichaIng Sep 21, 2021
7b1548f
Live patch 1 v7.6 (#4764)
MichaIng Sep 21, 2021
5320442
v7.7
MichaIng Sep 21, 2021
a047c62
v7.7
MichaIng Sep 22, 2021
12a6e26
v7.7
MichaIng Sep 23, 2021
e369d88
v7.7
MichaIng Sep 24, 2021
8e0b5fd
v7.7
MichaIng Sep 24, 2021
48ad84b
v7.7
MichaIng Sep 24, 2021
287449e
v7.7
MichaIng Sep 24, 2021
407be68
v7.7
MichaIng Sep 24, 2021
a648f8d
Live patch 2+3 v7.6 (#4776)
MichaIng Sep 24, 2021
8a50694
v7.7
MichaIng Sep 25, 2021
e33d7f1
v7.7
MichaIng Sep 25, 2021
efb35c8
v7.7
MichaIng Sep 25, 2021
842a11e
v7.7
MichaIng Sep 27, 2021
6115fcd
v7.7
MichaIng Sep 29, 2021
7a86672
v7.7
MichaIng Sep 29, 2021
bb3a664
v7.7 (#4787)
MichaIng Sep 29, 2021
5135056
v7.7
MichaIng Sep 29, 2021
3c4032a
v7.7
MichaIng Sep 29, 2021
b40a664
Live patch 3 v7.6 (#4789)
MichaIng Sep 29, 2021
ee8ad81
v7.7
MichaIng Sep 29, 2021
1e8143f
v7.7
MichaIng Sep 29, 2021
c198eb9
v7.7
MichaIng Sep 29, 2021
9653688
v7.7
MichaIng Sep 29, 2021
03bc475
v7.7
MichaIng Sep 29, 2021
34d90cb
v7.7
MichaIng Sep 29, 2021
b515195
v7.7
MichaIng Sep 29, 2021
4bfc669
v7.7
MichaIng Sep 29, 2021
8381d2c
v7.7
MichaIng Sep 30, 2021
3b8d9a9
v7.7
MichaIng Oct 1, 2021
7a69a78
v7.7
MichaIng Oct 1, 2021
d7ff86d
v7.7
MichaIng Oct 3, 2021
a170169
v7.7
MichaIng Oct 3, 2021
6db9dad
v7.7
MichaIng Oct 3, 2021
25f3005
v7.7
MichaIng Oct 3, 2021
06fc1b6
v7.7
MichaIng Oct 3, 2021
0b033f9
v7.7
MichaIng Oct 3, 2021
af3ef54
v7.7
MichaIng Oct 4, 2021
04939bc
v7.7
MichaIng Oct 4, 2021
aac254f
v7.7 (#4798)
MichaIng Oct 4, 2021
f9f98ee
v7.7
MichaIng Oct 4, 2021
3e8437f
v7.7
MichaIng Oct 4, 2021
c1febe7
v7.7
MichaIng Oct 6, 2021
3c4d4b9
v7.7
MichaIng Oct 6, 2021
223219f
v7.7 (#4809)
MichaIng Oct 7, 2021
55ebb80
v7.7
MichaIng Oct 7, 2021
c748f5f
v7.7 (#4812)
MichaIng Oct 8, 2021
a91530c
v7.7
MichaIng Oct 8, 2021
6049e66
v7.7 (#4810)
MichaIng Oct 9, 2021
51d620c
v7.7
MichaIng Oct 9, 2021
3acf06b
v7.7
MichaIng Oct 9, 2021
c693337
Merge branch 'master' into dev
MichaIng Oct 9, 2021
4f44b09
v7.7
MichaIng Oct 9, 2021
12ce8a4
v7.7
MichaIng Oct 9, 2021
9303e17
v7.7
MichaIng Oct 9, 2021
b657acd
v7.7
MichaIng Oct 9, 2021
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
v7.7
+ DietPi-PREP/Pre-patches | Add missing execute permissions for /boot FAT partition kernel hack
+ DietPi-(Pre-)patches | Apply previously required deb.debian.org HTTPS patch to Mosquitto and Webmin repos, where it is still required.
MichaIng committed Oct 9, 2021
commit 4f44b098a471b3d14fdb4b1f306fa353362a54f9
6 changes: 3 additions & 3 deletions .update/patches
Original file line number Diff line number Diff line change
@@ -326,9 +326,9 @@ Patch_7_6()

Patch_7_7()
{
G_DIETPI-NOTIFY 2 'Reverting deb.debian.org back to HTTPS'
G_EXEC sed -i 's|http://deb.debian.org|https://deb.debian.org|' /etc/apt/sources.list
[[ $(find /etc/apt/sources.list/*.list 2> /dev/null) ]] && G_EXEC sed -i 's|http://deb.debian.org|https://deb.debian.org|' /etc/apt/sources.list.d/*.list
G_DIETPI-NOTIFY 2 'Reverting Mosquitto and Webmin repositories back to HTTPS'
G_EXEC sed -i sed -Ei 's#http://(repo.mosquitto.org|download.webmin.com)#https://\1#' /etc/apt/sources.list
[[ $(find /etc/apt/sources.list/*.list 2> /dev/null) ]] && G_EXEC sed -i sed -Ei 's#http://(repo.mosquitto.org|download.webmin.com)#https://\1#' /etc/apt/sources.list.d/*.list

# Inform users about abandoned CouchPotato and in case add systemd service to DietPi-Services includes, at it has been removed from the hardcoded list
if [[ -f '/boot/dietpi/.installed' ]] && grep -q '^[[:blank:]]*aSOFTWARE_INSTALL_STATE\[142\]=2' /boot/dietpi/.installed
7 changes: 4 additions & 3 deletions .update/pre-patches
Original file line number Diff line number Diff line change
@@ -118,6 +118,7 @@ do
done
}
_EOF_
G_EXEC chmod +x /etc/kernel/preinst.d/dietpi
fi

# v7.7
@@ -130,9 +131,9 @@ fi
# v7.7
if (( $G_DIETPI_VERSION_CORE < 7 || ( $G_DIETPI_VERSION_CORE == 7 && $G_DIETPI_VERSION_SUB < 7 ) ))
then
G_DIETPI-NOTIFY 2 'Connecting to deb.debian.org via plain HTTP once until latest OpenSSL has been installed: https://github.com/MichaIng/DietPi/issues/4795'
G_EXEC sed -i 's|https://deb.debian.org|http://deb.debian.org|' /etc/apt/sources.list
[[ $(find /etc/apt/sources.list/*.list 2> /dev/null) ]] && G_EXEC sed -i 's|https://deb.debian.org|http://deb.debian.org|' /etc/apt/sources.list.d/*.list
G_DIETPI-NOTIFY 2 'Connecting to Mosquitto and Webmin repositories via plain HTTP once until latest OpenSSL has been installed: https://github.com/MichaIng/DietPi/issues/4795'
G_EXEC sed -Ei 's#https://(repo.mosquitto.org|download.webmin.com)#http://\1#' /etc/apt/sources.list
[[ $(find /etc/apt/sources.list/*.list 2> /dev/null) ]] && G_EXEC sed -Ei 's#https://(repo.mosquitto.org|download.webmin.com)#http://\1#' /etc/apt/sources.list.d/*.list

# Add execute permissions to kernel/initramfs hooks
[[ -f '/etc/initramfs/post-update.d/99-dietpi-uboot' && ! -x '/etc/initramfs/post-update.d/99-dietpi-uboot' ]] && G_EXEC chmod +x /etc/initramfs/post-update.d/99-dietpi-uboot
1 change: 1 addition & 0 deletions PREP_SYSTEM_FOR_DIETPI.sh
Original file line number Diff line number Diff line change
@@ -814,6 +814,7 @@ do
done
}
_EOF_
G_EXEC chmod +x /etc/kernel/preinst.d/dietpi
fi

G_AGI "${apackages[@]}"