Merge pull request #31 from cjom/plymouth

Change config files/folders named "batocera" to "system" or "reglinux"

.github/ISSUE_TEMPLATE/bug_report.yml

@@ -17,7 +17,7 @@ body:
       description: |
         REG Linux version used.
         GUI: SYSTEM SETTINGS -> INFORMATION
-        Terminal: cat /usr/share/batocera/batocera.version
+        Terminal: cat /usr/share/reglinux/system.version
         Or details can be obtained from batocera-info in your support file. (See logs below)
       placeholder: 39-dev-2da5edeea0 2024/02/03 03:28
     validations:
@@ -74,7 +74,7 @@ body:
       label: Details of any attempts to fix this yourself
       description: |
         1. Details of what you have tried to fix this yourself.
-        2. i.e. Set the resolution to 1920 x 1080 using batocera.conf file
+        2. i.e. Set the resolution to 1920 x 1080 using system.conf file
         3. Tried these instructions from the wiki here...
       placeholder: |
         I spoke to someone on discord and they told me to change this file.

board/fsoverlay/etc/init.d/S97update

@@ -10,7 +10,7 @@ mount -o remount,rw /boot
 mv /boot/REG_UPDATE /tmp/
 # Don't remount ro yet
 
-BOOTCONF="/boot/batocera-boot.conf"
+BOOTCONF="/boot/system-boot.conf"
 LOG="/tmp/rescue.log"
 
 # Display error with timeout
@@ -75,10 +75,10 @@ function replaceuuid() {
 }
 
 function extractupgradefiles() {
-	# Exclude batocera-boot.conf to avoid losing user settings and restoring triggers
+	# Exclude system-boot.conf to avoid losing user settings and restoring triggers
 	# Also exclude files already updated
 	# tar --no-same-owner is needed because fat partition does not support owner attributes
-	if ! tar -C /boot/ --no-same-owner --exclude='batocera-boot.conf' --exclude='config.txt' --zstd -xf "${SHAREMOUNT}/system/upgrade/boot-${board}.tar.zst"; then
+	if ! tar -C /boot/ --no-same-owner --exclude='system-boot.conf' --exclude='config.txt' --zstd -xf "${SHAREMOUNT}/system/upgrade/boot-${board}.tar.zst"; then
 		echo "Error extracting files from ${SHAREMOUNT}/system/upgrade/boot-${board}.tar.zst"
 		exit 1
 	fi
@@ -116,7 +116,7 @@ SHAREPART=$(batocera-part share_internal)
 SHAREMOUNT=$(grep -m 1 -E "^$SHAREPART " /proc/mounts | awk '{print $2}')
 [ -z "$SHAREMOUNT" ] && mountshareinternal
 
-board=$(cat /boot/boot/batocera.board)
+board=$(cat /boot/boot/system.board)
 if [ -f "${SHAREMOUNT}/system/upgrade/boot-${board}.tar.zst" ]; then
 	((TOTALSTEPS += 6))
 	((TASKS += 1000))

board/scripts/post-build-script.sh

@@ -52,7 +52,7 @@ chmod 755 "${TARGET_DIR}/etc/init.d/S"*
 rm -rf "${TARGET_DIR}/"{var,run,sys,tmp} || exit 1
 mkdir "${TARGET_DIR}/"{var,run,sys,tmp}  || exit 1
 
-# make /etc/shadow a file generated from /boot/batocera-boot.conf for security
+# make /etc/shadow a file generated from /boot/system-boot.conf for security
 rm -f "${TARGET_DIR}/etc/shadow" || exit 1
 touch "${TARGET_DIR}/run/batocera.shadow"
 (cd "${TARGET_DIR}/etc" && ln -sf "../run/batocera.shadow" "shadow") || exit 1

board/scripts/post-image-script.sh

@@ -8,7 +8,7 @@
 # TARGET_DIR = target dir
 
 RESCUE_TARGET=$(grep -E "^BR2_PACKAGE_RESCUE_TARGET_[A-Z_0-9]*=y$" "${BR2_CONFIG}" | sed -e s+'^BR2_PACKAGE_RESCUE_TARGET_\([A-Z_0-9]*\)=y$'+'\1'+)
-SUFFIXVERSION=$(cat "${TARGET_DIR}/usr/share/batocera/batocera.version" | sed -e s+'^\([0-9\.]*\).*$'+'\1'+) # xx.yy version
+SUFFIXVERSION=$(cat "${TARGET_DIR}/usr/share/reglinux/system.version" | sed -e s+'^\([0-9\.]*\).*$'+'\1'+) # xx.yy version
 SUFFIXDATE=$(date +%Y%m%d)
 
 # final filename

board/x86/fsoverlay/etc/init.d/S05nvidia

@@ -8,23 +8,23 @@ echo "OS version: $(batocera-version)" >> $log
 echo  >> $log
 
 # detect the appropriate Nvidia driver
-if grep -qE "^[ ]*nvidia-driver[ ]*=[ ]*true[ ]*$" /boot/batocera-boot.conf
+if grep -qE "^[ ]*nvidia-driver[ ]*=[ ]*true[ ]*$" /boot/system-boot.conf
 then
     echo "Manual setting to latest production driver" >> $log
     batocera-nvidia production
-elif grep -qE "^[ ]*nvidia-driver[ ]*=[ ]*legacy[ ]*$" /boot/batocera-boot.conf
+elif grep -qE "^[ ]*nvidia-driver[ ]*=[ ]*legacy[ ]*$" /boot/system-boot.conf
 then
     echo "Manual setting to legacy 470 driver" >> $log
     batocera-nvidia legacy
-elif grep -qE "^[ ]*nvidia-driver[ ]*=[ ]*legacy390[ ]*$" /boot/batocera-boot.conf
+elif grep -qE "^[ ]*nvidia-driver[ ]*=[ ]*legacy390[ ]*$" /boot/system-boot.conf
 then
     echo "Manual setting to legacy 390 driver" >> $log
     batocera-nvidia legacy390
-elif grep -qE "^[ ]*nvidia-driver[ ]*=[ ]*legacy340[ ]*$" /boot/batocera-boot.conf
+elif grep -qE "^[ ]*nvidia-driver[ ]*=[ ]*legacy340[ ]*$" /boot/system-boot.conf
 then
     echo "Manual setting to legacy 340 driver, however it's broken, using nouveau" >> $log
     batocera-nvidia nouveau
-elif grep -qE "^[ ]*nvidia-driver[ ]*=[ ]*false[ ]*$" /boot/batocera-boot.conf
+elif grep -qE "^[ ]*nvidia-driver[ ]*=[ ]*false[ ]*$" /boot/system-boot.conf
 then
     echo "Manual setting to nouveau driver" >> $log
     batocera-nvidia nouveau

board/x86/fsoverlay/etc/init.d/S30checkprime

@@ -18,7 +18,7 @@ case "$1" in
         echo "Setting best primary GPU..." >> "$display_log"
 
         # Check for NVIDIA GPUs
-        nvidia_prime=$(/usr/bin/batocera-settings-get -f /boot/batocera-boot.conf nvidia-prime)
+        nvidia_prime=$(/usr/bin/batocera-settings-get -f /boot/system-boot.conf nvidia-prime)
         if [ "$nvidia_prime" = "false" ]; then
             echo "'nvidia-prime' manually set to false, skipping checks" >> "$nvidia_log"
         else
@@ -32,7 +32,7 @@ case "$1" in
         fi
         # Check for AMD/ATI GPUs if Nvidia Prime has not already been set
         if [ "$nvidia_conditions_met" = "false" ]; then
-            radeon_prime=$(/usr/bin/batocera-settings-get -f /boot/batocera-boot.conf radeon-prime)
+            radeon_prime=$(/usr/bin/batocera-settings-get -f /boot/system-boot.conf radeon-prime)
             if [ "$radeon_prime" = "false" ]; then
                 echo "'radeon-prime' manually set to false, skipping checks" >> "$amd_log"
             else

package/core/rescue-system/rescue-system.mk

@@ -34,9 +34,9 @@ endif
 define RESCUE_SYSTEM_INSTALL_TARGET_CMDS
 
 	# version/arch
-	mkdir -p $(TARGET_DIR)/usr/share/batocera
-	echo -n "$(RESCUE_SYSTEM_ARCH)" > $(TARGET_DIR)/usr/share/batocera/batocera.arch
-	echo $(RESCUE_SYSTEM_VERSION)$(RESCUE_SYSTEM_COMMIT) $(RESCUE_SYSTEM_DATE_TIME) > $(TARGET_DIR)/usr/share/batocera/batocera.version
+	mkdir -p $(TARGET_DIR)/usr/share/reglinux
+	echo -n "$(RESCUE_SYSTEM_ARCH)" > $(TARGET_DIR)/usr/share/reglinux/system.arch
+	echo $(RESCUE_SYSTEM_VERSION)$(RESCUE_SYSTEM_COMMIT) $(RESCUE_SYSTEM_DATE_TIME) > $(TARGET_DIR)/usr/share/reglinux/system.version
 
 	# variables
 	mkdir -p $(TARGET_DIR)/etc/profile.d