diff --git a/pkg/daemon/kernelargs.go b/pkg/daemon/kernelargs.go index 71ab7eefaa..de7134ef09 100644 --- a/pkg/daemon/kernelargs.go +++ b/pkg/daemon/kernelargs.go @@ -144,14 +144,14 @@ func parseTuningFile(tuningFilePath, cmdLinePath string) ([]types.TuneArgument, } // UpdateTuningArgs executes additions and removals of kernel tuning arguments -func UpdateTuningArgs(tuningFilePath, cmdLinePath string) (bool, error) { +func UpdateTuningArgs(tuningFilePath, cmdLinePath string) error { if cmdLinePath == "" { cmdLinePath = CmdLineFile } changed := false additions, deletions, err := parseTuningFile(tuningFilePath, cmdLinePath) if err != nil { - return changed, err + return err } // Execute additions @@ -160,7 +160,7 @@ func UpdateTuningArgs(tuningFilePath, cmdLinePath string) (bool, error) { changed = true err := exec.Command("rpm-ostree", "kargs", fmt.Sprintf("--append=%s", toAdd.Key)).Run() if err != nil { - return false, errors.Wrapf(err, "adding karg") + return fmt.Errorf("failed adding karg: %w", err) } } else { panic("Not supported") @@ -172,11 +172,15 @@ func UpdateTuningArgs(tuningFilePath, cmdLinePath string) (bool, error) { changed = true err := exec.Command("rpm-ostree", "kargs", fmt.Sprintf("--delete=%s", toDelete.Key)).Run() if err != nil { - return false, errors.Wrapf(err, "deleting karg") + return fmt.Errorf("failed deleting karg: %w", err) } } else { panic("Not supported") } } - return changed, nil + + if changed { + glog.Info("Updated kernel tuning arguments") + } + return nil } diff --git a/pkg/daemon/update.go b/pkg/daemon/update.go index 14c13b2e02..4e5e66ac15 100644 --- a/pkg/daemon/update.go +++ b/pkg/daemon/update.go @@ -592,13 +592,9 @@ func (dn *Daemon) update(oldConfig, newConfig *mcfgv1.MachineConfig) (retErr err // Ideally we would want to update kernelArguments only via MachineConfigs. // We are keeping this to maintain compatibility and OKD requirement. - tuningChanged, err := UpdateTuningArgs(KernelTuningFile, CmdLineFile) - if err != nil { + if err := UpdateTuningArgs(KernelTuningFile, CmdLineFile); err != nil { return err } - if tuningChanged { - glog.Info("Updated kernel tuning arguments") - } if err := dn.storeCurrentConfigOnDisk(newConfig); err != nil { return err