gaspersic/go-ethereum
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

cmd/utils: don't enumerate USB unless --usb is set (#22130)

Browse Source 
USB enumeration still occured. Make sure it will only occur if --usb is set.
This also deprecates the 'NoUSB' config file option in favor of a new option 'USB'.
This commit is contained in:
Guillaume Ballet
2021-01-13 10:14:36 +00:00
committed by GitHub
parent 93a89b2681
commit c7a6be163f
12 changed files with 21 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
cmd/utils/flags.go
View File

@ -1233,12 +1233,12 @@ func SetNodeConfig(ctx *cli.Context, cfg *node.Config) {
if ctx.GlobalIsSet(LightKDFFlag.Name) {
cfg.UseLightweightKDF = ctx.GlobalBool(LightKDFFlag.Name)
}
if ctx.GlobalIsSet(USBFlag.Name) {
cfg.NoUSB = !ctx.GlobalBool(USBFlag.Name)
}
if ctx.GlobalIsSet(NoUSBFlag.Name) {
if ctx.GlobalIsSet(NoUSBFlag.Name) || cfg.NoUSB {
log.Warn("Option nousb is deprecated and USB is deactivated by default. Use --usb to enable")
}
if ctx.GlobalIsSet(USBFlag.Name) {
cfg.USB = ctx.GlobalBool(USBFlag.Name)
}
if ctx.GlobalIsSet(InsecureUnlockAllowedFlag.Name) {
cfg.InsecureUnlockAllowed = ctx.GlobalBool(InsecureUnlockAllowedFlag.Name)
}