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

Merge pull request #1255 from zgc/klever1988

Browse Source 
在线升级脚本对x86增加disk变量，解决安装盘不是sda情况，默认还是sda
This commit is contained in:
stupidloud
2022-12-17 12:47:19 +08:00
committed by GitHub
parent 82062a57cb 1c10ccbc11
commit 77fb5ba191
3 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
README.md
View File

@@ -25,6 +25,10 @@ slim版
```bash ```bash
wget -qO- https://github.com/stupidloud/nanopi-openwrt/raw/master/scripts/autoupdate-bash.sh | ver=-slim bash wget -qO- https://github.com/stupidloud/nanopi-openwrt/raw/master/scripts/autoupdate-bash.sh | ver=-slim bash
``` ```
x86安装盘不是sda的情况下使用
```bash
wget -qO- https://github.com/klever1988/nanopi-openwrt/raw/master/scripts/autoupdate-bash.sh | disk=sdb bash
```
(脚本由gary lau提供，非常感谢！) (脚本由gary lau提供，非常感谢！)
### 固件特性： ### 固件特性：

2
scripts/autoupdate-bash.sh
View File

@@ -43,7 +43,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' [ ! -d /sys/block/$block_device ] && block_device='mmcblk1'
[ $board_id = 'x86' ] && block_device='sda' [ $board_id = 'x86' ] && block_device=${disk:-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
echo ", +" | sfdisk -N 2 FriendlyWrt.img echo ", +" | sfdisk -N 2 FriendlyWrt.img

2
scripts/autoupdate.sh
View File

@@ -48,7 +48,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' [ ! -d /sys/block/$block_device ] && block_device='mmcblk1'
[ $board_id = 'x86' ] && block_device='sda' [ $board_id = 'x86' ] && block_device=${disk:-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
echo ", +" | sfdisk -N 2 FriendlyWrt.img echo ", +" | sfdisk -N 2 FriendlyWrt.img