From fde0d785bcda3b69b8b4f99773a85247a44efe9b Mon Sep 17 00:00:00 2001 From: a random person on the internet Date: Sat, 21 Sep 2024 15:54:13 -0400 Subject: [PATCH] update --- boot/grubfm/distro/andmenu.sh | 2 +- boot/grubfm/distro/android.sh | 2 +- boot/grubfm/global.sh | 3 ++- boot/grubfm/init.sh | 9 +++++++++ boot/grubfm/ver | 2 +- release.sh | 2 +- 6 files changed, 15 insertions(+), 5 deletions(-) diff --git a/boot/grubfm/distro/andmenu.sh b/boot/grubfm/distro/andmenu.sh index e7c7e0e..8677471 100644 --- a/boot/grubfm/distro/andmenu.sh +++ b/boot/grubfm/distro/andmenu.sh @@ -21,7 +21,7 @@ if [ "${android_install}" = " " ]; then } else menuentry "[+] Install Android" --class settings{ - export android_install=; + export android_install=" "; configfile ${prefix}/distro/andmenu.sh; } fi; diff --git a/boot/grubfm/distro/android.sh b/boot/grubfm/distro/android.sh index 2e906c3..8efc2a9 100644 --- a/boot/grubfm/distro/android.sh +++ b/boot/grubfm/distro/android.sh @@ -1,6 +1,6 @@ export vmlinuz_img="(loop)/kernel"; export initrd_img="(loop)/initrd.img"; -export android_selinux="androidboot.selinux=permissive"; +export android_selinux=""; export android_hardware=" "; export android="(loop)" configfile ${prefix}/distro/andmenu.sh; \ No newline at end of file diff --git a/boot/grubfm/global.sh b/boot/grubfm/global.sh index b4dace1..65e9b61 100644 --- a/boot/grubfm/global.sh +++ b/boot/grubfm/global.sh @@ -20,7 +20,8 @@ then fi; hiddenentry " " --hotkey f1 { - configfile ${prefix}/hwinfo.sh; + echo "Sorry, this crashes GRUB2 - do NOT run - check pinned issue in repo!" + sleep 5 } hiddenentry " " --hotkey f2 { diff --git a/boot/grubfm/init.sh b/boot/grubfm/init.sh index 14e76c4..392ed03 100644 --- a/boot/grubfm/init.sh +++ b/boot/grubfm/init.sh @@ -16,6 +16,15 @@ echo Starting G2FM beta... set color_normal=yellow/black +if cpuid -l; +then + export CPU=64; +else + export CPU=32; +fi +stat -r -q -s RAM; +export RAM; + echo " " # The following code is from agFM for Easy2Boot echo " " diff --git a/boot/grubfm/ver b/boot/grubfm/ver index e88f332..2b1bfc2 100644 --- a/boot/grubfm/ver +++ b/boot/grubfm/ver @@ -1 +1 @@ -3c17590f-a0f8-4fbc-878a-15a49c50c7a3 +b32a73ae-09f1-4784-bc51-2fb5a0fe74bd diff --git a/release.sh b/release.sh index 11baaec..74d2c9a 100755 --- a/release.sh +++ b/release.sh @@ -12,7 +12,7 @@ do echo "Starting build with value: ${i}" echo "${i}" | ./build.sh echo "Copying files" - cp grubfm.iso g2fm_multiarch.iso loadfm samples/ + cp grubfm.iso loadfm samples/ cp grubfm*.efi g2fm*.efi samples/ echo "Creating 7z file" cd samples