Merge "Move to toybox basename(1)." am: d00bbd72f4
am: 88151f0aae
Change-Id: If0350082172e378d31a74def9bea1f2f3e78821a
This commit is contained in:
commit
6d983b256c
|
@ -75,7 +75,6 @@ func GetConfig(name string) PathConfig {
|
||||||
|
|
||||||
var Configuration = map[string]PathConfig{
|
var Configuration = map[string]PathConfig{
|
||||||
"awk": Allowed,
|
"awk": Allowed,
|
||||||
"basename": Allowed,
|
|
||||||
"bash": Allowed,
|
"bash": Allowed,
|
||||||
"bc": Allowed,
|
"bc": Allowed,
|
||||||
"bzip2": Allowed,
|
"bzip2": Allowed,
|
||||||
|
@ -161,23 +160,24 @@ var Configuration = map[string]PathConfig{
|
||||||
"pkg-config": Forbidden,
|
"pkg-config": Forbidden,
|
||||||
|
|
||||||
// On linux we'll use the toybox version of these instead
|
// On linux we'll use the toybox version of these instead
|
||||||
"cat": Toybox,
|
"basename": Toybox,
|
||||||
"comm": Toybox,
|
"cat": Toybox,
|
||||||
"env": Toybox,
|
"comm": Toybox,
|
||||||
"id": Toybox,
|
"env": Toybox,
|
||||||
"od": Toybox,
|
"id": Toybox,
|
||||||
"paste": Toybox,
|
"od": Toybox,
|
||||||
"pwd": Toybox,
|
"paste": Toybox,
|
||||||
"rmdir": Toybox,
|
"pwd": Toybox,
|
||||||
"setsid": Toybox,
|
"rmdir": Toybox,
|
||||||
"sleep": Toybox,
|
"setsid": Toybox,
|
||||||
"tail": Toybox,
|
"sleep": Toybox,
|
||||||
"tee": Toybox,
|
"tail": Toybox,
|
||||||
"true": Toybox,
|
"tee": Toybox,
|
||||||
"uname": Toybox,
|
"true": Toybox,
|
||||||
"uniq": Toybox,
|
"uname": Toybox,
|
||||||
"whoami": Toybox,
|
"uniq": Toybox,
|
||||||
"xxd": Toybox,
|
"whoami": Toybox,
|
||||||
|
"xxd": Toybox,
|
||||||
}
|
}
|
||||||
|
|
||||||
func init() {
|
func init() {
|
||||||
|
|
Loading…
Reference in New Issue