yanistyle/nanopi-openwrt-r1s-h3
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

autoupdate: fix

Browse Source
This commit is contained in:
John Doe
2021-10-25 20:01:11 +08:00
parent eec7292d0e
commit 0a5c182473
3 changed files with 11 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
scripts/autoupdate-bash.sh
View File

@@ -40,8 +40,10 @@ if [ $md5r != $md5sum ]; then
fi fi
mv $board_id.img FriendlyWrt.img mv $board_id.img FriendlyWrt.img
[ $board_id == 'x86' ] && drive='sda' || drive='mmcblk0' block_device='mmcblk0'
bs=`expr $(cat /sys/block/$drive/size) \* 512` [ ! -d /sys/block/$block_device ] && block_device='mmcblk1'
[ $board_id = 'x86' ] && block_device='sda'
bs=`expr $(cat /sys/block/$block_device/size) \* 512`
truncate -s $bs FriendlyWrt.img || ../truncate -s $bs FriendlyWrt.img truncate -s $bs FriendlyWrt.img || ../truncate -s $bs FriendlyWrt.img
echo ", +" | sfdisk -N 2 FriendlyWrt.img echo ", +" | sfdisk -N 2 FriendlyWrt.img
@@ -78,8 +80,7 @@ echo -e '\e[92m开始写入，请勿中断...\e[0m'
if [ -f FriendlyWrt.img ]; then if [ -f FriendlyWrt.img ]; then
echo 1 > /proc/sys/kernel/sysrq echo 1 > /proc/sys/kernel/sysrq
echo u > /proc/sysrq-trigger && umount / || true echo u > /proc/sysrq-trigger && umount / || true
#pv FriendlyWrt.img | dd of=/dev/mmcblk0 conv=fsync dd if=FriendlyWrt.img of=/dev/$block_device oflag=direct conv=sparse status=progress bs=1M
dd if=FriendlyWrt.img of=/dev/$drive oflag=direct conv=sparse status=progress bs=1M
echo -e '\e[92m刷机完毕，正在重启...\e[0m' echo -e '\e[92m刷机完毕，正在重启...\e[0m'
echo b > /proc/sysrq-trigger echo b > /proc/sysrq-trigger
fi fi

10
scripts/autoupdate-offline.sh
View File

@@ -20,12 +20,12 @@ fi
unzip R2S*.zip unzip R2S*.zip
rm R2S*.zip rm R2S*.zip
if [ -f /mnt/mmcblk0p2/artifact/FriendlyWrt*.img.gz ]; then if [ -f /mnt/mmcblk0p2/artifact/FriendlyWrt*.img.gz ]; then
cd /mnt/mmcblk0p2/artifact/ cd /mnt/mmcblk0p2/artifact/
if [ `md5sum -c md5sum.txt|grep -c "OK"` -eq 0 ]; then if [ `md5sum -c md5sum.txt|grep -c "OK"` -eq 0 ]; then
echo -e '\e[91m固件HASH值匹配失败，脚本退出\e[0m' echo -e '\e[91m固件HASH值匹配失败，脚本退出\e[0m'
exit 1 exit 1
fi fi
cd /mnt/mmcblk0p2 cd /mnt/mmcblk0p2
pv /mnt/mmcblk0p2/artifact/FriendlyWrt*.img.gz | gunzip -dc > FriendlyWrt.img pv /mnt/mmcblk0p2/artifact/FriendlyWrt*.img.gz | gunzip -dc > FriendlyWrt.img
echo -e '\e[92m准备解压镜像文件\e[0m' echo -e '\e[92m准备解压镜像文件\e[0m'
fi fi

1
scripts/autoupdate.sh
View File

@@ -45,6 +45,7 @@ fi
mv $board_id.img FriendlyWrt.img mv $board_id.img FriendlyWrt.img
block_device='mmcblk0' block_device='mmcblk0'
[ ! -d /sys/block/$block_device ] && block_device='mmcblk1'
[ $board_id = 'x86' ] && block_device='sda' [ $board_id = 'x86' ] && block_device='sda'
bs=`expr $(cat /sys/block/$block_device/size) \* 512` bs=`expr $(cat /sys/block/$block_device/size) \* 512`
truncate -s $bs FriendlyWrt.img || ../truncate -s $bs FriendlyWrt.img truncate -s $bs FriendlyWrt.img || ../truncate -s $bs FriendlyWrt.img