mirror of
https://github.com/MiyooCFW/buildroot.git
synced 2025-09-27 22:24:19 +03:00
[FIRSTBOOT] add safet_shutdown() with log_firstboot.txt
- increase sleep time before shutdown - show unallocated space left in MB - dry a bit code
This commit is contained in:
@@ -53,28 +53,26 @@ console_var_func(){
|
|||||||
fi
|
fi
|
||||||
}
|
}
|
||||||
|
|
||||||
# write logs, sync & unmount MAIN then reboot/poweroff
|
# write logs, sync & unmount MAIN before reboot/poweroff
|
||||||
safe_reboot_func(){
|
safe_shutdown_func(){
|
||||||
echo "please wait a few seconds for a reboot...." | tee -a ${LOG}
|
echo "please wait a few seconds for a reboot...." | tee -a ${LOG}
|
||||||
dmesg > ${HOME}/dmesg.txt
|
dmesg > ${HOME}/dmesg.txt
|
||||||
|
mv ${LOG} ${HOME}/log_firstboot.txt
|
||||||
sync
|
sync
|
||||||
sleep 1
|
sleep 1
|
||||||
mount -o remount,ro "${MOUNTDIR}" | tee -a ${LOG}
|
mount -o remount,ro "${MOUNTDIR}" | tee -a ${LOG}
|
||||||
umount /dev/mmcblk0p4 | tee -a ${LOG}
|
umount /dev/mmcblk0p4 | tee -a ${LOG}
|
||||||
#umount /dev/mmcblk0p1 | tee -a ${LOG} # this fails
|
#umount /dev/mmcblk0p1 | tee -a ${LOG} # this fails
|
||||||
sleep 2
|
sleep 4
|
||||||
|
}
|
||||||
|
|
||||||
|
safe_reboot_func(){
|
||||||
|
safe_shutdown_func
|
||||||
reboot
|
reboot
|
||||||
}
|
}
|
||||||
|
|
||||||
safe_poweroff_func(){
|
safe_poweroff_func(){
|
||||||
echo "please wait a few seconds for a shutdown...." | tee -a ${LOG}
|
safe_shutdown_func
|
||||||
dmesg > ${HOME}/dmesg.txt
|
|
||||||
sync
|
|
||||||
sleep 1
|
|
||||||
mount -o remount,ro "${MOUNTDIR}" | tee -a ${LOG}
|
|
||||||
umount /dev/mmcblk0p4 | tee -a ${LOG}
|
|
||||||
#umount /dev/mmcblk0p1 | tee -a ${LOG} # this fails
|
|
||||||
sleep 2
|
|
||||||
poweroff
|
poweroff
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -494,7 +492,8 @@ if (dialog --clear --stdout --ok-label YES --cancel-label NO --title " AUTO-RE
|
|||||||
\n\n \ZbWARNING:\Zn\n After 10s auto-resize\n of FAT32 partition will begin." 15 60 10); then
|
\n\n \ZbWARNING:\Zn\n After 10s auto-resize\n of FAT32 partition will begin." 15 60 10); then
|
||||||
clear
|
clear
|
||||||
echo "The full size of your SD is ${SD_SIZE_IN_MiB}MiB large" | tee -a ${LOG}
|
echo "The full size of your SD is ${SD_SIZE_IN_MiB}MiB large" | tee -a ${LOG}
|
||||||
echo "Unallocated space available for resizing equals ${SD_MAX_UNALL_SIZE_IN_GB}GB" | tee -a ${LOG}
|
echo "Unallocated space available for resizing equals ${SD_MAX_UNALL_SIZE_IN_GB}GB," | tee -a ${LOG}
|
||||||
|
echo "and more precisely it's ${SD_MAX_UNALL_SIZE_IN_MB}MB big" | tee -a ${LOG}
|
||||||
echo "Going to resize the MAIN partition." | tee -a ${LOG}
|
echo "Going to resize the MAIN partition." | tee -a ${LOG}
|
||||||
echo "This can take A LONG TIME, so be patient." | tee -a ${LOG}
|
echo "This can take A LONG TIME, so be patient." | tee -a ${LOG}
|
||||||
umount /dev/mmcblk0p4 | tee -a ${LOG}
|
umount /dev/mmcblk0p4 | tee -a ${LOG}
|
||||||
@@ -544,8 +543,7 @@ echo
|
|||||||
|
|
||||||
sync
|
sync
|
||||||
echo "firstboot script finished." | tee -a ${LOG}
|
echo "firstboot script finished." | tee -a ${LOG}
|
||||||
#grep logs from temp directory
|
|
||||||
mv ${LOG} ${HOME}/log_firstboot.txt
|
|
||||||
echo
|
echo
|
||||||
|
|
||||||
# Reboot device if CONSOLE_VARIANT was overwritten from $CHOICE so that it could be applied in u-boot by readID
|
# Reboot device if CONSOLE_VARIANT was overwritten from $CHOICE so that it could be applied in u-boot by readID
|
||||||
@@ -553,4 +551,7 @@ echo
|
|||||||
if ($CONSOLE_OVERWRITE || $RESIZE_COMMENCED || test -r "${BASEDIR}/firstboot.custom.sh"); then
|
if ($CONSOLE_OVERWRITE || $RESIZE_COMMENCED || test -r "${BASEDIR}/firstboot.custom.sh"); then
|
||||||
touch ${HOME}/firstboot.completed
|
touch ${HOME}/firstboot.completed
|
||||||
safe_reboot_func
|
safe_reboot_func
|
||||||
|
else
|
||||||
|
#just grep logs from temp directory before continuing
|
||||||
|
mv ${LOG} ${HOME}/log_firstboot.txt
|
||||||
fi
|
fi
|
||||||
|
|||||||
Reference in New Issue
Block a user