Skip to content

Commit 77fb5ba

Browse files
authored
Merge pull request stupidloud#1255 from zgc/klever1988
在线升级脚本对x86增加disk变量,解决安装盘不是sda情况,默认还是sda
2 parents 82062a5 + 1c10ccb commit 77fb5ba

File tree

3 files changed

+6
-2
lines changed

3 files changed

+6
-2
lines changed

README.md

+4
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,10 @@ slim版
2525
```bash
2626
wget -qO- https://github.com/stupidloud/nanopi-openwrt/raw/master/scripts/autoupdate-bash.sh | ver=-slim bash
2727
```
28+
x86安装盘不是sda的情况下使用
29+
```bash
30+
wget -qO- https://github.com/klever1988/nanopi-openwrt/raw/master/scripts/autoupdate-bash.sh | disk=sdb bash
31+
```
2832
(脚本由gary lau提供,非常感谢!)
2933

3034
### 固件特性:

scripts/autoupdate-bash.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ fi
4343
mv $board_id.img FriendlyWrt.img
4444
block_device='mmcblk0'
4545
[ ! -d /sys/block/$block_device ] && block_device='mmcblk1'
46-
[ $board_id = 'x86' ] && block_device='sda'
46+
[ $board_id = 'x86' ] && block_device=${disk:-sda}
4747
bs=`expr $(cat /sys/block/$block_device/size) \* 512`
4848
truncate -s $bs FriendlyWrt.img || ../truncate -s $bs FriendlyWrt.img
4949
echo ", +" | sfdisk -N 2 FriendlyWrt.img

scripts/autoupdate.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ fi
4848
mv $board_id.img FriendlyWrt.img
4949
block_device='mmcblk0'
5050
[ ! -d /sys/block/$block_device ] && block_device='mmcblk1'
51-
[ $board_id = 'x86' ] && block_device='sda'
51+
[ $board_id = 'x86' ] && block_device=${disk:-sda}
5252
bs=`expr $(cat /sys/block/$block_device/size) \* 512`
5353
truncate -s $bs FriendlyWrt.img || ../truncate -s $bs FriendlyWrt.img
5454
echo ", +" | sfdisk -N 2 FriendlyWrt.img

0 commit comments

Comments
 (0)