diff --git a/0004-KubOS-increase-the-space-of-the-boot-partition.patch b/0004-KubOS-increase-the-space-of-the-boot-partition.patch new file mode 100644 index 0000000000000000000000000000000000000000..df93654467b4accf8e61498e8e52687ba5825fa9 --- /dev/null +++ b/0004-KubOS-increase-the-space-of-the-boot-partition.patch @@ -0,0 +1,37 @@ +From 999df1ce10a9adb48554573c6acfc289f3f2c46f Mon Sep 17 00:00:00 2001 +From: liyuanrong +Date: Wed, 2 Mar 2022 19:15:06 +0800 +Subject: [PATCH] KubOS:increase the space of the boot partition + +Since openEuler 22.03-LTS, the space required by grub-related +packages is increased. Therefore, the space of the boot partition +is not enough. Therefore, the space of the boot partition needs to +be increased + +Signed-off-by: liyuanrong +--- + scripts/generate.sh | 8 ++++---- + 1 file changed, 4 insertions(+), 4 deletions(-) + +diff --git a/scripts/generate.sh b/scripts/generate.sh +index c481e30..5a97033 100644 +--- a/scripts/generate.sh ++++ b/scripts/generate.sh +@@ -221,10 +221,10 @@ function create_img() { + rm -f system.img update.img + qemu-img create system.img ${IMG_SIZE}G + parted system.img -- mklabel msdos +- parted system.img -- mkpart primary fat16 1MiB 60MiB +- parted system.img -- mkpart primary ext4 60MiB 2160MiB +- parted system.img -- mkpart primary ext4 2160MiB 4260MiB +- parted system.img -- mkpart primary ext4 4260MiB 100% ++ parted system.img -- mkpart primary fat16 1MiB 100MiB ++ parted system.img -- mkpart primary ext4 100MiB 2200MiB ++ parted system.img -- mkpart primary ext4 2200MiB 4300MiB ++ parted system.img -- mkpart primary ext4 4300MiB 100% + + local device=$(losetup -f) + losetup "${device}" system.img +-- +1.8.3.1 + diff --git a/0005-KubeOS-fix-sshd-startup-failed.patch b/0005-KubeOS-fix-sshd-startup-failed.patch new file mode 100644 index 0000000000000000000000000000000000000000..2e13fcea164400ec58c8111bc16405b31aab2880 --- /dev/null +++ b/0005-KubeOS-fix-sshd-startup-failed.patch @@ -0,0 +1,28 @@ +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 db61b0487a46f51fc7b16a2b2f3a34857a605243..de243a596de64e248b0ab9e292701b7598055d72 100644 --- a/KubeOS.spec +++ b/KubeOS.spec @@ -2,13 +2,15 @@ Name: KubeOS Version: 1.0.1 -Release: 5 +Release: 7 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 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 @@ -81,6 +83,18 @@ install -p -m 0600 ./files/os-release %{buildroot}/opt/kubeOS/files rm -rfv %{buildroot} %changelog +* Wed Mar 02 2022 liyuanrong - 1.0.1-7 +- Type:requirement +- CVE:NA +- SUG:restart +- DESC:fix sshd startup failed + +* Wed Mar 02 2022 liyuanrong - 1.0.1-6 +- Type:requirement +- CVE:NA +- SUG:restart +- DESC:increase the space of the boot partition + * Fri Dec 17 2021 liyuanrong - 1.0.1-5 - Type:requirement - CVE:NA