kubekey/backport-0001-fix-invalid-syntax-of-etc_sysctl_conf.patch
chenmaodong 69cc390fc9 fix invalid syntax of /etc/sysctl.conf after executing init os script
Signed-off-by: chenmaodong <chenmaodong@xfusion.com>
2022-12-29 19:11:48 +08:00

28 lines
1.1 KiB
Diff

From fbd73b6c14fc9db366e68b60c9a189019777fc20 Mon Sep 17 00:00:00 2001
From: faror <hung.z.h916@gmail.com>
Date: Fri, 19 Aug 2022 11:31:36 +0800
Subject: [PATCH] fixed #1453
---
pkg/bootstrap/os/templates/init_script.go | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/pkg/bootstrap/os/templates/init_script.go b/pkg/bootstrap/os/templates/init_script.go
index 289d2577..fd0ffe10 100644
--- a/pkg/bootstrap/os/templates/init_script.go
+++ b/pkg/bootstrap/os/templates/init_script.go
@@ -83,7 +83,9 @@ sed -r -i "s@#{0,}?vm.swappiness ?= ?([0-9]{1,})@vm.swappiness = 1@g" /etc/sysc
sed -r -i "s@#{0,}?fs.inotify.max_user_instances ?= ?([0-9]{1,})@fs.inotify.max_user_instances = 524288@g" /etc/sysctl.conf
sed -r -i "s@#{0,}?kernel.pid_max ?= ?([0-9]{1,})@kernel.pid_max = 65535@g" /etc/sysctl.conf
-awk ' !x[$0]++{print > "/etc/sysctl.conf"}' /etc/sysctl.conf
+tmpfile="$$.tmp"
+awk ' !x[$0]++{print > "'$tmpfile'"}' /etc/sysctl.conf
+mv $tmpfile /etc/sysctl.conf
systemctl stop firewalld 1>/dev/null 2>/dev/null
systemctl disable firewalld 1>/dev/null 2>/dev/null
--
2.21.0