Change FullPageOS to use bookworm mount boot path

guysoft · Feb 24, 2024 · d9649f5 · d9649f5
1 parent 2500af9
commit d9649f5
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 9 deletions.
diff --git a/src/modules/fullpageos/filesystem/home/pi/scripts/get_url b/src/modules/fullpageos/filesystem/home/pi/scripts/get_url
@@ -1,5 +1,5 @@
 #!/bin/bash
 
 SERIAL=`cat /proc/cpuinfo | grep -i '^Serial' | awk '{ print $3 }'`
-URL="$(head -n 1 /boot/fullpageos.txt | sed -e "s/{serial}/${SERIAL}/g")"
-echo $URL
+URL="$(head -n 1 /boot/firmware/fullpageos.txt | sed -e "s/{serial}/${SERIAL}/g")"
+echo $URL
diff --git a/src/modules/fullpageos/filesystem/home/pi/scripts/run_onepageos b/src/modules/fullpageos/filesystem/home/pi/scripts/run_onepageos
@@ -4,7 +4,7 @@ USER_AGENT="Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Geck
 
 while true
 do
-    if [[ $(curl -sL -b cookiefile -w "%{http_code}\\n" -H "user-agent: ${USER_AGENT}" "$(/home/pi/scripts/get_url)" -o /dev/null) =~ ^([23][0-9]{2,2}|401)$ ]] || grep -q disabled "/boot/check_for_httpd" ; then
+    if [[ $(curl -sL -b cookiefile -w "%{http_code}\\n" -H "user-agent: ${USER_AGENT}" "$(/home/pi/scripts/get_url)" -o /dev/null) =~ ^([23][0-9]{2,2}|401)$ ]] || grep -q disabled "/boot/firmware/check_for_httpd" ; then
       xdotool mousemove 9000 9000
       %BROWSER_START_SCRIPT%
     fi

diff --git a/src/modules/fullpageos/filesystem/root_init/etc/systemd/system/splashscreen.service b/src/modules/fullpageos/filesystem/root_init/etc/systemd/system/splashscreen.service
@@ -4,7 +4,7 @@ DefaultDependencies=no
 After=local-fs.target
 
 [Service]
-ExecStart=/usr/bin/fbi -d /dev/fb0 --noverbose -a /boot/splash.png
+ExecStart=/usr/bin/fbi -d /dev/fb0 --noverbose -a /boot/firmware/splash.png
 StandardInput=tty
 StandardOutput=tty
 

diff --git a/src/modules/fullpageos/start_chroot_script b/src/modules/fullpageos/start_chroot_script
@@ -19,8 +19,8 @@ apt-get update
 if [ "$FULLPAGEOS_CUSTOM_SPLASHSCREEN" == "yes" ]
 then
     apt-get install -y fbi
-    sed -i 's/$/ logo.nologo consoleblank=0 loglevel=0 quiet/' /boot/cmdline.txt
-    echo "disable_splash=1" >> /boot/config.txt
+    sed -i 's/$/ logo.nologo consoleblank=0 loglevel=0 quiet/' /"${BASE_BOOT_MOUNT_PATH}"/cmdline.txt
+    echo "disable_splash=1" >> /"${BASE_BOOT_MOUNT_PATH}"/config.txt
     systemctl enable splashscreen.service
     systemctl disable getty@tty1
 fi
@@ -59,7 +59,7 @@ then
             chown -R www-data:www-data FullPageDashboard
             chmod 775 FullPageDashboard
             pushd FullPageDashboard
-                sed -i "s@'INIT_URL_PATH', __DIR__ . '/init.txt'@'INIT_URL_PATH', '/boot/fullpagedashboard.txt'@g" config.php
+                sed -i "s@'INIT_URL_PATH', __DIR__ . '/init.txt'@'INIT_URL_PATH', '/"${BASE_BOOT_MOUNT_PATH}"/fullpagedashboard.txt'@g" config.php
             popd
         fi
         #Set Welcome screen
@@ -70,9 +70,9 @@ then
         fi
     popd
 
-    echo "enabled" > /boot/check_for_httpd
+    echo "enabled" > /"${BASE_BOOT_MOUNT_PATH}"/check_for_httpd
 else
-    echo "disabled" > /boot/check_for_httpd
+    echo "disabled" > /"${BASE_BOOT_MOUNT_PATH}"/check_for_httpd
 fi