From 797b9e52ca0a3fd5899829c4ffb8d762ac5ccf53 Mon Sep 17 00:00:00 2001 From: liyuanrong Date: Fri, 11 Mar 2022 11:04:34 +0800 Subject: [PATCH] KubeOS:undo the temporary fix for the sshd startup failure The sshd startup failure has been fixed by openssh. Therefore, the previous temporary modification will be canceled. Signed-off-by: liyuanrong --- 0005-KubeOS-fix-sshd-startup-failed.patch | 28 ----------------------- KubeOS.spec | 9 ++++++-- 2 files changed, 7 insertions(+), 30 deletions(-) delete mode 100644 0005-KubeOS-fix-sshd-startup-failed.patch diff --git a/0005-KubeOS-fix-sshd-startup-failed.patch b/0005-KubeOS-fix-sshd-startup-failed.patch deleted file mode 100644 index 2e13fce..0000000 --- a/0005-KubeOS-fix-sshd-startup-failed.patch +++ /dev/null @@ -1,28 +0,0 @@ -From 36df3575bd7cd4e0fd6434f5d12fd5b92534541d Mon Sep 17 00:00:00 2001 -From: liyuanrong -Date: Wed, 2 Mar 2022 19:17:00 +0800 -Subject: [PATCH] KubeOS:fix sshd startup failed - -Temporarily fix the sshd startup failure caused by absence -of the /var/empty/sshd - -Signed-off-by: liyuanrong ---- - scripts/generate.sh | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/scripts/generate.sh b/scripts/generate.sh -index 5a97033..7255fcd 100644 ---- a/scripts/generate.sh -+++ b/scripts/generate.sh -@@ -258,6 +258,7 @@ function create_img() { - - init_part system.img4 PERSIST "${TMP_MOUNT_PATH}" - mkdir ${TMP_MOUNT_PATH}/{var,etc,etcwork} -+ mkdir -p ${TMP_MOUNT_PATH}/var/empty/sshd - umount "${TMP_MOUNT_PATH}" - - losetup -D --- -1.8.3.1 - diff --git a/KubeOS.spec b/KubeOS.spec index de243a5..cc4e54a 100644 --- a/KubeOS.spec +++ b/KubeOS.spec @@ -2,7 +2,7 @@ Name: KubeOS Version: 1.0.1 -Release: 7 +Release: 8 Summary: O&M platform used to update the whole OS as an entirety License: Mulan PSL v2 Source0: https://gitee.com/openeuler/KubeOS/repository/archive/v%{version}.tar.gz @@ -10,7 +10,6 @@ Patch1: 0001-KubeOS-modify-checks-in-generate.sh-and-change-modul.patch Patch2: 0002-change-generate-argument-from-isopath-to-repopath.patch Patch3: 0003-KubeOS-add-arm-architecture-support-to-the-OS-image.patch Patch4: 0004-KubOS-increase-the-space-of-the-boot-partition.patch -Patch5: 0005-KubeOS-fix-sshd-startup-failed.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRequires: make BuildRequires: golang >= 1.13 @@ -83,6 +82,12 @@ install -p -m 0600 ./files/os-release %{buildroot}/opt/kubeOS/files rm -rfv %{buildroot} %changelog +* Fri Mar 11 2022 liyuanrong - 1.0.1-8 +- Type:requirement +- CVE:NA +- SUG:restart +- DESC:Undo the temporary fix for the sshd startup failure + * Wed Mar 02 2022 liyuanrong - 1.0.1-7 - Type:requirement - CVE:NA -- Gitee