rancher/os
1
0
Fork 1
mirror of https://github.com/rancher/os.git synced 2025-09-07 01:31:06 +00:00
Code Issues Releases Wiki Activity

Allow question marks in unquoted kernel parameters

Browse Source
This commit is contained in:
Josh Curl
2017-01-04 16:34:40 -08:00
parent 81b35c69e1
commit c6232e67aa
2 changed files with 10 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
config/data_funcs.go
View File

@@ -116,11 +116,12 @@ func getOrSetVal(args string, data map[interface{}]interface{}, value interface{
return "", tData
}
// Replace newlines and colons with random strings
// Replace newlines, colons, and question marks with random strings
// This is done to avoid YAML treating these as special characters
var (
newlineMagicString = "9XsJcx6dR5EERYCC"
colonMagicString = "V0Rc21pIVknMm2rr"
newlineMagicString = "9XsJcx6dR5EERYCC"
colonMagicString = "V0Rc21pIVknMm2rr"
questionMarkMagicString = "FoPL6JLMAaJqKMJT"
)
func reverseReplacement(result interface{}) interface{} {
@@ -138,6 +139,7 @@ func reverseReplacement(result interface{}) interface{} {
case string:
val = strings.Replace(val, newlineMagicString, "\n", -1)
val = strings.Replace(val, colonMagicString, ":", -1)
val = strings.Replace(val, questionMarkMagicString, "?", -1)
return val
}
@@ -147,6 +149,7 @@ func reverseReplacement(result interface{}) interface{} {
func unmarshalOrReturnString(value string) (result interface{}) {
value = strings.Replace(value, "\n", newlineMagicString, -1)
value = strings.Replace(value, ":", colonMagicString, -1)
value = strings.Replace(value, "?", questionMarkMagicString, -1)
if err := yaml.Unmarshal([]byte(value), &result); err != nil {
result = value
}