yuan/RROrg-rr
1
0
Fork 0
mirror of https://github.com/RROrg/rr.git synced 2025-06-21 05:51:05 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #524 from fbelavenuto/boot-improving

Browse Source 
Boot improving, arpl kernel config
This commit is contained in:
Fabio Belavenuto 2023-01-20 15:00:51 -03:00 committed by GitHub
commit 7525dc51be
7 changed files with 15 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
VERSION
View File

@ -1 +1 @@
1.0-beta12 1.0-beta13

3
files/board/arpl/kernel_defconfig
View File

@ -18,6 +18,7 @@ CONFIG_CGROUP_FREEZER=y
CONFIG_CPUSETS=y CONFIG_CPUSETS=y
CONFIG_CGROUP_CPUACCT=y CONFIG_CGROUP_CPUACCT=y
CONFIG_NAMESPACES=y CONFIG_NAMESPACES=y
CONFIG_SYSFS_DEPRECATED=y
CONFIG_BLK_DEV_INITRD=y CONFIG_BLK_DEV_INITRD=y
# CONFIG_RD_GZIP is not set # CONFIG_RD_GZIP is not set
# CONFIG_RD_BZIP2 is not set # CONFIG_RD_BZIP2 is not set
@ -465,7 +466,9 @@ CONFIG_AUTOFS4_FS=y
CONFIG_MSDOS_FS=y CONFIG_MSDOS_FS=y
CONFIG_VFAT_FS=y CONFIG_VFAT_FS=y
CONFIG_PROC_KCORE=y CONFIG_PROC_KCORE=y
CONFIG_TMPFS=y
CONFIG_HUGETLBFS=y CONFIG_HUGETLBFS=y
CONFIG_EFIVAR_FS=y
CONFIG_NFS_FS=y CONFIG_NFS_FS=y
CONFIG_NFS_V3_ACL=y CONFIG_NFS_V3_ACL=y
CONFIG_NFS_V4=y CONFIG_NFS_V4=y

12
files/board/arpl/overlayfs/opt/arpl/boot.sh
View File

@ -18,9 +18,6 @@ printf "\033[1;44m%*s\033[0m\n" ${COLUMNS} ""
TITLE="BOOTING..." TITLE="BOOTING..."
printf "\033[1;33m%*s\033[0m\n" $(((${#TITLE}+${COLUMNS})/2)) "${TITLE}" printf "\033[1;33m%*s\033[0m\n" $(((${#TITLE}+${COLUMNS})/2)) "${TITLE}"
history -w
sync
# Check if DSM zImage changed, patch it if necessary # Check if DSM zImage changed, patch it if necessary
ZIMAGE_HASH="`readConfigKey "zimage-hash" "${USER_CONFIG_FILE}"`" ZIMAGE_HASH="`readConfigKey "zimage-hash" "${USER_CONFIG_FILE}"`"
if [ "`sha256sum "${ORI_ZIMAGE_FILE}" | awk '{print$1}'`" != "${ZIMAGE_HASH}" ]; then if [ "`sha256sum "${ORI_ZIMAGE_FILE}" | awk '{print$1}'`" != "${ZIMAGE_HASH}" ]; then
@ -29,7 +26,7 @@ if [ "`sha256sum "${ORI_ZIMAGE_FILE}" | awk '{print$1}'`" != "${ZIMAGE_HASH}" ];
if [ $? -ne 0 ]; then if [ $? -ne 0 ]; then
dialog --backtitle "`backtitle`" --title "Error" \ dialog --backtitle "`backtitle`" --title "Error" \
--msgbox "zImage not patched:\n`<"${LOG_FILE}"`" 12 70 --msgbox "zImage not patched:\n`<"${LOG_FILE}"`" 12 70
return 1 exit 1
fi fi
fi fi
@ -41,7 +38,7 @@ if [ "`sha256sum "${ORI_RDGZ_FILE}" | awk '{print$1}'`" != "${RAMDISK_HASH}" ];
if [ $? -ne 0 ]; then if [ $? -ne 0 ]; then
dialog --backtitle "`backtitle`" --title "Error" \ dialog --backtitle "`backtitle`" --title "Error" \
--msgbox "Ramdisk not patched:\n`<"${LOG_FILE}"`" 12 70 --msgbox "Ramdisk not patched:\n`<"${LOG_FILE}"`" 12 70
return 1 exit 1
fi fi
fi fi
@ -142,8 +139,7 @@ if [ "${DIRECT}" = "true" ]; then
echo -e "\033[1;33mReboot to boot directly in DSM\033[0m" echo -e "\033[1;33mReboot to boot directly in DSM\033[0m"
grub-editenv ${GRUB_PATH}/grubenv set next_entry="direct" grub-editenv ${GRUB_PATH}/grubenv set next_entry="direct"
reboot reboot
sleep 100 exit 0
exit
fi fi
echo -e "\033[1;37mLoading DSM kernel...\033[0m" echo -e "\033[1;37mLoading DSM kernel...\033[0m"
@ -156,4 +152,4 @@ else
fi fi
echo -e "\033[1;37mBooting...\033[0m" echo -e "\033[1;37mBooting...\033[0m"
poweroff poweroff
while true; do sleep 1; done # infinity loop exit 0

2
files/board/arpl/overlayfs/opt/arpl/include/consts.sh
View File

@ -1,5 +1,5 @@
ARPL_VERSION="1.0-beta12" ARPL_VERSION="1.0-beta13"
# Define paths # Define paths
TMP_PATH="/tmp" TMP_PATH="/tmp"

4
files/board/arpl/overlayfs/opt/arpl/init.sh
View File

@ -158,7 +158,9 @@ elif grep -q "IWANTTOCHANGETHECONFIG" /proc/cmdline; then
fi fi
# If is to boot automatically, do it # If is to boot automatically, do it
[ ${BOOT} -eq 1 ] && boot.sh if [ ${BOOT} -eq 1 ]; then
boot.sh && exit 0
fi
# Wait for an IP # Wait for an IP
COUNT=0 COUNT=0

5
files/board/arpl/overlayfs/opt/arpl/menu.sh
View File

@ -1162,7 +1162,7 @@ function updateMenu() {
if [ "x$1" = "xb" -a -n "${MODEL}" -a -n "${BUILD}" -a loaderIsConfigured ]; then if [ "x$1" = "xb" -a -n "${MODEL}" -a -n "${BUILD}" -a loaderIsConfigured ]; then
make make
boot boot && exit 0 || sleep 5
fi fi
# Main loop # Main loop
NEXT="m" NEXT="m"
@ -1206,7 +1206,7 @@ while true; do
i) synoinfoMenu; NEXT="v" ;; i) synoinfoMenu; NEXT="v" ;;
v) advancedMenu; NEXT="d" ;; v) advancedMenu; NEXT="d" ;;
d) make; NEXT="b" ;; d) make; NEXT="b" ;;
b) boot ;; b) boot && exit 0 || sleep 5 ;;
k) keymapMenu ;; k) keymapMenu ;;
c) dialog --backtitle "`backtitle`" --title "Cleaning" --aspect 18 \ c) dialog --backtitle "`backtitle`" --title "Cleaning" --aspect 18 \
--prgbox "rm -rfv \"${CACHE_PATH}/dl\"" 0 0 ;; --prgbox "rm -rfv \"${CACHE_PATH}/dl\"" 0 0 ;;
@ -1216,4 +1216,3 @@ while true; do
done done
clear clear
echo -e "Call \033[1;32mmenu.sh\033[0m to return to menu" echo -e "Call \033[1;32mmenu.sh\033[0m to return to menu"

2
files/board/arpl/p1/ARPL-VERSION
View File

@ -1 +1 @@
1.0-beta12 1.0-beta13