Align with Bookworm (#24)

* New firmware directory location

* Patch updateHyperionUser.sh

* Revert "Patch updateHyperionUser.sh"

This reverts commit 2dcc08c.

* Patch 2.0.16 updateHyperionUser.sh

* Add /rootfs

stage-hyperbian/00-install-hyperion/00-run.sh

@@ -2,8 +2,8 @@
 
 # Enable SPI and force HDMI output
 echo '---> Enable SPI and force HDMI output'
-sed -i "s/^#dtparam=spi=on.*/dtparam=spi=on/" ${ROOTFS_DIR}/boot/config.txt
-sed -i "s/^#hdmi_force_hotplug=1.*/hdmi_force_hotplug=1/" ${ROOTFS_DIR}/boot/config.txt
+sed -i "s/^#dtparam=spi=on.*/dtparam=spi=on/" ${ROOTFS_DIR}/boot/firmware/config.txt
+sed -i "s/^#hdmi_force_hotplug=1.*/hdmi_force_hotplug=1/" ${ROOTFS_DIR}/boot/firmware/config.txt
 
 # Modify /usr/lib/os-release
 echo '---> Customize HyperBian'
@@ -24,4 +24,4 @@ sed -i "s/^#PrintLastLog yes.*/PrintLastLog no/" ${ROOTFS_DIR}/etc/ssh/sshd_conf
 # Add Hyperion DEB822 sources file, download public gpg key and update package information
 echo '---> Integrate Hyperion Project Repository into HyperBian'
 install -m 644 files/hyperion.sources ${ROOTFS_DIR}/etc/apt/sources.list.d/
-on_chroot <<< "curl --silent --show-error --location 'https://releases.hyperion-project.org/hyperion.pub.key' | gpg --dearmor -o /etc/apt/keyrings/hyperion.pub.gpg && apt-get update"
+on_chroot <<< "curl --silent --show-error --location 'https://releases.hyperion-project.org/hyperion.pub.key' | gpg --dearmor -o /etc/apt/keyrings/hyperion.pub.gpg && apt-get update"

stage-hyperbian/00-install-hyperion/01-patches/series

@@ -0,0 +1 @@
+updateHyperionUser.patch

stage-hyperbian/00-install-hyperion/01-patches/updateHyperionUser.patch

@@ -0,0 +1,23 @@
+Index: /rootfs/usr/share/hyperion/scripts/updateHyperionUser.sh
+===================================================================
+--- .orig/rootfs/usr/share/hyperion/scripts/updateHyperionUser.sh
++++ /rootfs/usr/share/hyperion/scripts/updateHyperionUser.sh
+@@ -70,7 +70,7 @@ if [[ ! -z ${CURRENT_SERVICE} ]]; then
+ 		exit 0;
+ 	fi
+ 	echo "Disable current service: ${CURRENT_SERVICE}"
+-	systemctl is-active --quiet ${CURRENT_SERVICE} && systemctl disable --quiet ${CURRENT_SERVICE} --now >/dev/null 2>&1
++	systemctl disable --quiet ${CURRENT_SERVICE} --now >/dev/null 2>&1
+ fi
+
+ HYPERION="hyperion"
+@@ -84,9 +84,6 @@ NEW_SERVICE="${HYPERION}@${USERNAME}.ser
+ echo "Restarting Hyperion Service: ${NEW_SERVICE}"
+ systemctl enable --quiet ${NEW_SERVICE} --now >/dev/null 2>&1
+
+-# Update HyperBian splash screen
+-sed -i "s/${CURRENT_SERVICE}/${NEW_SERVICE}/" /etc/update-motd.d/10-hyperbian >/dev/null 2>&1
+-
+ echo "Done."
+ exit 0
+