Skip to content

Commit

Permalink
v8.22
Browse files Browse the repository at this point in the history
- Odroid C1 | Resolved an issue where the latest kernel upgrade broke boot of the Odroid C1. We do now pin, in case downgrade, and set on hold "current" and "edge" kernel packages of Armbian to v23.02.2 (Linux 5.15.93 respectively 6.1.11) with this DietPi update, which are the latest known functional packages for this SBC. Many thanks to `@oskar242000` for reporting this issue: https://dietpi.com/forum/t/odroid-c1-not-booting-after-kernel-upgrade/17818
  • Loading branch information
MichaIng committed Sep 22, 2023
1 parent ce95081 commit 6ccef11
Show file tree
Hide file tree
Showing 3 changed files with 24 additions and 0 deletions.
9 changes: 9 additions & 0 deletions .update/patches
Original file line number Diff line number Diff line change
Expand Up @@ -1493,6 +1493,15 @@ _EOF_
G_DIETPI-NOTIFY 2 'Fixing fdtfile entry in dietpiEnv.txt ...'
G_EXEC sed -i '/^fdtfile=$/d' /boot/dietpiEnv.txt
fi

# Odroid C1: Set kernel packages on hold. We pin them in pre-patches and enforce an automated downgrade, in case, but since v23.02.2 might not be available forever, we should also set them on hold, until we know there is a compatble newer version available:
# - https://dietpi.com/forum/t/odroid-c1-not-booting-after-kernel-upgrade/17818
# - https://github.com/MichaIng/DietPi/issues/6616#issuecomment-1730900296
if (( $G_HW_MODEL == 10 ))
then
G_DIETPI-NOTIFY 2 'Setting Odroid C1 "current" and "edge" kernel packages on hold'
G_EXEC apt-mark hold linux-image-current-meson linux-dtb-current-meson linux-headers-current-meson linux-image-edge-meson linux-dtb-edge-meson linux-headers-edge-meson
fi
}

# v6.35 => v7 migration
Expand Down
14 changes: 14 additions & 0 deletions .update/pre-patches
Original file line number Diff line number Diff line change
Expand Up @@ -289,6 +289,20 @@ _EOF_
Package: base-files
Pin: release o=Debian
Pin-Priority: 1000
_EOF_
G_EXEC eval 'echo '\''APT::Get::Allow-Downgrades "1";'\'' > /etc/apt/apt.conf.d/dietpi-armbian'
fi

# Odroid C1: Pin "current" and "edge" kernel versions to Armbian 23.02.2, which are the latest currently known functional versions for C1:
# - https://dietpi.com/forum/t/odroid-c1-not-booting-after-kernel-upgrade/17818
# - https://github.com/MichaIng/DietPi/issues/6616#issuecomment-1730900296
if (( $G_HW_MODEL == 10 ))
then
G_DIETPI-NOTIFY 2 'Pinning Odroid C1 "current" and "edge" kernel packages to latest known functional version and in case enforcing automated downgrade'
cat << '_EOF_' > /etc/apt/preferences.d/00-dietpi-odroidc1
Package: linux-image-current-meson linux-dtb-current-meson linux-headers-current-meson linux-image-edge-meson linux-dtb-edge-meson linux-headers-edge-meson
Pin: version 23.02.2
Pin-Priority: 1000
_EOF_
G_EXEC eval 'echo '\''APT::Get::Allow-Downgrades "1";'\'' > /etc/apt/apt.conf.d/dietpi-armbian'
fi
Expand Down
1 change: 1 addition & 0 deletions CHANGELOG.txt
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@ Enhancements:
Bug fixes:
- NanoPi R4S | Resolved a v8.21 regression where the Ethernet LEDs did not react correctly after the kernel upgrade. Many thanks to @idaanx for reporting this issue: https://github.com/MichaIng/DietPi/issues/6342#issuecomment-1697669420
- Orange Pi 5 | Resolved a v8.21 regression where the update may have lead to an unbootable system or caused other issues like missing HDMI output, because of a falsely set device tree file name.
- Odroid C1 | Resolved an issue where the latest kernel upgrade broke boot of the Odroid C1. We do now pin, in case downgrade, and set on hold "current" and "edge" kernel packages of Armbian to v23.02.2 (Linux 5.15.93 respectively 6.1.11) with this DietPi update, which are the latest known functional packages for this SBC. Many thanks to @oskar242000 for reporting this issue: https://dietpi.com/forum/t/odroid-c1-not-booting-after-kernel-upgrade/17818
- Bookworm | Resolved an issue where poweroff/reboot/halt commands did throw errors about missing dbus or logind. DietPi ships without dbus and with logind masked by default, as we do not see their features being used on a typical DietPi system. Instead, dbus is installed and logind unmasked on demand on certain software installs or when chosen via dietpi.txt. However, the newer systemd version since Bookworm attempts dbus > logind communication in any case when calling poweroff/reboot/halt, despite no wall message being sent, e.g. to handle shutdown inhibitors (like open SSH session being able to prevent shutdown), and throws errors if either dbus is not reachable or logind not running. Until in case dbus or logind are further tied into common system commands or features, we solved the issue by creating shell functions for poweroff/reboot/halt which call the respective systemd target directly to bypass logind (and hence dbus), but fall back to the original commands, depending on given command-line parameters.
- dietpi-bookworm-upgrade | Resolved an issue on systems with Armbian repository, where the system was still identified as Bullseye after the distribution upgrade to Bookworm. Reason was Armbian's base-files package, which was not upgraded as intended. On all DietPi systems, the original base-files package from Debian will now be enforced to prevent this and similar issues. Many thanks to @rogerthn2019 for reporting this issue: https://github.com/MichaIng/DietPi/issues/6227#issuecomment-1713688577
- DietPi-Config | The menu option to update the SPI bootloader is now shown on Orange Pi 5 Plus as well, as intended. Many thanks for @zappydood for reporting its absence: https://github.com/MichaIng/DietPi/issues/6501#issuecomment-1697175109
Expand Down

0 comments on commit 6ccef11

Please sign in to comment.