KubeOS/0018-KubeOS-update-config-log-contents.patch
Yuhang Wei 1d36b74685 KubeOS:sync code from source master branch
Signed-off-by: Yuhang Wei <weiyuhang3@huawei.com>
2024-02-26 09:54:27 +08:00

40 lines
1.4 KiB
Diff

From 662f68aa131c09154bb91085e4657beaee00d1d6 Mon Sep 17 00:00:00 2001
From: Yuhang Wei <weiyuhang3@huawei.com>
Date: Mon, 21 Aug 2023 09:58:45 +0800
Subject: [PATCH 1/5] KubeOS: update config log contents
Signed-off-by: Yuhang Wei <weiyuhang3@huawei.com>
---
cmd/agent/server/config.go | 8 ++++++--
1 file changed, 6 insertions(+), 2 deletions(-)
diff --git a/cmd/agent/server/config.go b/cmd/agent/server/config.go
index a96370d..f186ee6 100644
--- a/cmd/agent/server/config.go
+++ b/cmd/agent/server/config.go
@@ -57,7 +57,7 @@ func (k KernelSysctl) SetConfig(config *agent.SysConfig) error {
}
logrus.Infof("Configured kernel.sysctl %s=%s", key, keyInfo.Value)
} else {
- logrus.Warnf("Failed to parse kernel.sysctl key: %s value: %s operation: %s", key, keyInfo.Value, keyInfo.Operation)
+ logrus.Warnf("Failed to parse kernel.sysctl, key: %s, value: %s, operation: %s", key, keyInfo.Value, keyInfo.Operation)
}
}
return nil
@@ -97,7 +97,11 @@ type GrubCmdline struct {
// SetConfig sets grub.cmdline configuration
func (g GrubCmdline) SetConfig(config *agent.SysConfig) error {
- logrus.Info("start set grub.cmdline configuration")
+ if g.isCurPartition {
+ logrus.Info("start set grub.cmdline.current configuration")
+ } else {
+ logrus.Info("start set grub.cmdline.next configuration")
+ }
fileExist, err := checkFileExist(getGrubCfgPath())
if err != nil {
logrus.Errorf("Failed to find config path: %v", err)
--
2.39.0