Merge pull request #126 from angelabriel/master

Fixes for the next maintenance update

actions/table.go

@@ -544,7 +544,7 @@ func printWrappedRow(writer io.Writer, wrappedElem map[string][]string, rowEleme
 }
 
 // printRow prints now the row of the table
-func printRow (writer io.Writer, twist bool, cols []string, rowElements map[string]string) {
+func printRow(writer io.Writer, twist bool, cols []string, rowElements map[string]string) {
 	if twist {
 		if rowElements["type"] == "verify" {
 			fmt.Fprintf(writer, rowElements["colFormat"], rowElements["note"], rowElements["parameter"], cols[1], cols[2], cols[0], rowElements["compliant"])

ospackage/man/saptune-note.5

@@ -207,7 +207,7 @@ All fields are separated by spaces. But please do not use spaces around the equa
 
 The <noteId> must be a text string without spaces. It was planned for future use, but this field was never used.
 
-The internal used NoteID - the unique identifier of a Note definition - was always taken from the filename of the Note definition file without extention '.conf'. It will be displayed during the action 'saptune note list' and used for all other actions, where the NoteID is needed as parameter.
+The internal used NoteID - the unique identifier of a Note definition - was always taken from the filename of the Note definition file without extension '.conf'. It will be displayed during the action 'saptune note list' and used for all other actions, where the NoteID is needed as parameter.
 
 The CATEGORY is for future use. So we do not have defined CATEGORIES at the moment. It must be a text string without spaces.
 

ospackage/usr/share/saptune/schemas/1.0/templates/README.md

@@ -15,7 +15,7 @@ FORCE=1 ./generate_unsupported.sh
 With FORCE=1 the script will not override existing templates. To do so use FORCE=2.
 
 !!! Update `UNSUPPORTED_COMMANDS` first, if the list of supported commands has changed. !!!
-!!! See aslo table below.                                                               !!!
+!!! See also table below.                                                               !!!
 
 After creating the templates, the schemas can be generated with build.py (see next section).
 

sap/note/ini.go

@@ -325,7 +325,7 @@ func (vend INISettings) Apply() error {
 		case INISectionMEM:
 			errs = append(errs, SetMemVal(param.Key, vend.SysctlParams[param.Key]))
 		case INISectionCPU:
-			errs = append(errs, SetCPUVal(param.Key, vend.SysctlParams[param.Key], vend.ID, flstates, vend.OverrideParams[param.Key], vend.Inform[param.Key], revertValues))
+			errs = append(errs, SetCPUVal(param.Key, vend.SysctlParams[param.Key], vend.ID, flstates, vend.OverrideParams[param.Key], revertValues))
 		case INISectionPagecache:
 			if revertValues {
 				switch param.Key {

sap/note/sectCPU.go

@@ -82,12 +82,12 @@ func OptCPUVal(key, actval, cfgval string) string {
 }
 
 // SetCPUVal applies the settings to the system
-func SetCPUVal(key, value, noteID, savedStates, oval, info string, revert bool) error {
+func SetCPUVal(key, value, noteID, savedStates, oval string, revert bool) error {
 	var err error
 	switch key {
 	case "force_latency":
 		if oval != "untouched" {
-			err = system.SetForceLatency(value, savedStates, info, revert)
+			err = system.SetForceLatency(value, savedStates, revert)
 			if !revert {
 				// the cpu state values of the note need to be stored
 				// after they are set. Special for 'force_latency'
@@ -101,7 +101,7 @@ func SetCPUVal(key, value, noteID, savedStates, oval, info string, revert bool)
 	case "energy_perf_bias":
 		err = system.SetPerfBias(value)
 	case "governor":
-		err = system.SetGovernor(value, info)
+		err = system.SetGovernor(value)
 	}
 
 	return err