Skip to content
This repository has been archived by the owner on May 8, 2024. It is now read-only.

Boot improving, arpl kernel config #524

Merged
merged 2 commits into from
Jan 20, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion VERSION
Original file line number Diff line number Diff line change
@@ -1 +1 @@
1.0-beta12
1.0-beta13
3 changes: 3 additions & 0 deletions files/board/arpl/kernel_defconfig
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@ CONFIG_CGROUP_FREEZER=y
CONFIG_CPUSETS=y
CONFIG_CGROUP_CPUACCT=y
CONFIG_NAMESPACES=y
CONFIG_SYSFS_DEPRECATED=y
CONFIG_BLK_DEV_INITRD=y
# CONFIG_RD_GZIP is not set
# CONFIG_RD_BZIP2 is not set
Expand Down Expand Up @@ -465,7 +466,9 @@ CONFIG_AUTOFS4_FS=y
CONFIG_MSDOS_FS=y
CONFIG_VFAT_FS=y
CONFIG_PROC_KCORE=y
CONFIG_TMPFS=y
CONFIG_HUGETLBFS=y
CONFIG_EFIVAR_FS=y
CONFIG_NFS_FS=y
CONFIG_NFS_V3_ACL=y
CONFIG_NFS_V4=y
Expand Down
12 changes: 4 additions & 8 deletions files/board/arpl/overlayfs/opt/arpl/boot.sh
Original file line number Diff line number Diff line change
Expand Up @@ -18,9 +18,6 @@ printf "\033[1;44m%*s\033[0m\n" ${COLUMNS} ""
TITLE="BOOTING..."
printf "\033[1;33m%*s\033[0m\n" $(((${#TITLE}+${COLUMNS})/2)) "${TITLE}"

history -w
sync

# Check if DSM zImage changed, patch it if necessary
ZIMAGE_HASH="`readConfigKey "zimage-hash" "${USER_CONFIG_FILE}"`"
if [ "`sha256sum "${ORI_ZIMAGE_FILE}" | awk '{print$1}'`" != "${ZIMAGE_HASH}" ]; then
Expand All @@ -29,7 +26,7 @@ if [ "`sha256sum "${ORI_ZIMAGE_FILE}" | awk '{print$1}'`" != "${ZIMAGE_HASH}" ];
if [ $? -ne 0 ]; then
dialog --backtitle "`backtitle`" --title "Error" \
--msgbox "zImage not patched:\n`<"${LOG_FILE}"`" 12 70
return 1
exit 1
fi
fi

Expand All @@ -41,7 +38,7 @@ if [ "`sha256sum "${ORI_RDGZ_FILE}" | awk '{print$1}'`" != "${RAMDISK_HASH}" ];
if [ $? -ne 0 ]; then
dialog --backtitle "`backtitle`" --title "Error" \
--msgbox "Ramdisk not patched:\n`<"${LOG_FILE}"`" 12 70
return 1
exit 1
fi
fi

Expand Down Expand Up @@ -142,8 +139,7 @@ if [ "${DIRECT}" = "true" ]; then
echo -e "\033[1;33mReboot to boot directly in DSM\033[0m"
grub-editenv ${GRUB_PATH}/grubenv set next_entry="direct"
reboot
sleep 100
exit
exit 0
fi
echo -e "\033[1;37mLoading DSM kernel...\033[0m"

Expand All @@ -156,4 +152,4 @@ else
fi
echo -e "\033[1;37mBooting...\033[0m"
poweroff
while true; do sleep 1; done # infinity loop
exit 0
2 changes: 1 addition & 1 deletion files/board/arpl/overlayfs/opt/arpl/include/consts.sh
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@

ARPL_VERSION="1.0-beta12"
ARPL_VERSION="1.0-beta13"

# Define paths
TMP_PATH="/tmp"
Expand Down
4 changes: 3 additions & 1 deletion files/board/arpl/overlayfs/opt/arpl/init.sh
Original file line number Diff line number Diff line change
Expand Up @@ -158,7 +158,9 @@ elif grep -q "IWANTTOCHANGETHECONFIG" /proc/cmdline; then
fi

# 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
COUNT=0
Expand Down
5 changes: 2 additions & 3 deletions files/board/arpl/overlayfs/opt/arpl/menu.sh
Original file line number Diff line number Diff line change
Expand Up @@ -1162,7 +1162,7 @@ function updateMenu() {

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

2 changes: 1 addition & 1 deletion files/board/arpl/p1/ARPL-VERSION
Original file line number Diff line number Diff line change
@@ -1 +1 @@
1.0-beta12
1.0-beta13