rancher/os
1
0
Fork 1
mirror of https://github.com/rancher/os.git synced 2025-08-01 15:08:47 +00:00
Code Issues Releases Wiki Activity

Unescape kernel params

Browse Source 
so kernel params like rancher.cloud_init.datasources='["url:http://10.0.2.2:8800/cc.yml"]' could be used
This commit is contained in:
Ivan Mikushin 2016-07-15 15:02:29 -07:00
parent b882a7c049
commit 22887dfb0b
4 changed files with 19 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
config/config_test.go
View File

@ -108,6 +108,7 @@ func TestParseCmdline(t *testing.T) {
"key1": "value1",
"key2": "value2",
"keyArray": []interface{}{int64(1), int64(2)},
"strArray": []interface{}{"url:http://192.168.1.100/cloud-config"},
"obj1": map[interface{}]interface{}{
"key3": "3value",
"obj2": map[interface{}]interface{}{
@ -120,7 +121,7 @@ func TestParseCmdline(t *testing.T) {
},
}
actual := parseCmdline("a b rancher.rescue rancher.keyArray=[1,2] rancher.key1=value1 c rancher.key2=value2 rancher.obj1.key3=3value rancher.obj1.obj2.key4 rancher.key5=5 rancher.key6=a,b rancher.key7=a\nb")
actual := parseCmdline("a b rancher.rescue rancher.keyArray=[1,2] rancher.strArray=[\"url:http://192.168.1.100/cloud-config\"] rancher.key1=value1 c rancher.key2=value2 rancher.obj1.key3=3value rancher.obj1.obj2.key4 rancher.key5=5 rancher.key6=a,b rancher.key7=a\nb")
assert.Equal(expected, actual)
}

2
config/disk.go
View File

@ -176,7 +176,7 @@ func readCmdline() map[interface{}]interface{} {
log.Debugf("Config cmdline %s", cmdLine)
cmdLineObj := parseCmdline(strings.TrimSpace(string(cmdLine)))
cmdLineObj := parseCmdline(strings.TrimSpace(util.UnescapeKernelParams(string(cmdLine))))
return cmdLineObj
}

6
util/util.go
View File

@ -225,3 +225,9 @@ func GetCurrentContainerId() (string, error) {
return parts[len(parts)-1:][0], nil
}
func UnescapeKernelParams(s string) string {
s = strings.Replace(s, `\"`, `"`, -1)
s = strings.Replace(s, `\'`, `'`, -1)
return s
}

10
util/util_test.go
View File

@ -90,3 +90,13 @@ func TestMerge(t *testing.T) {
}
assert.Equal(expected, Merge(m0, m1))
}
func TestCmdLineStr(t *testing.T) {
assert := require.New(t)
cmdLine := `rancher.cloud_init.datasources=[\'url:http://192.168.1.100/cloud-config\']`
assert.Equal("rancher.cloud_init.datasources=['url:http://192.168.1.100/cloud-config']", UnescapeKernelParams(cmdLine))
cmdLine = `rancher.cloud_init.datasources=[\"url:http://192.168.1.100/cloud-config\"]`
assert.Equal(`rancher.cloud_init.datasources=["url:http://192.168.1.100/cloud-config"]`, UnescapeKernelParams(cmdLine))
}