diff --git a/docs/changelog-compared-with-upstream.md b/docs/changelog-compared-with-upstream.md index 9148090ffc5cad921103153537fa97b016969165..48f72759a07a3bd8ff34a4e645d0019c13c8b16b 100644 --- a/docs/changelog-compared-with-upstream.md +++ b/docs/changelog-compared-with-upstream.md @@ -54,6 +54,7 @@ #### 屏蔽不支持的kola选项 #### 暂不支持以osbuild方式构建磁盘镜像 #### 支持添加自签名根证书 +#### 暂不支持fips模式,屏蔽src/gf-mksquashfs文件中内核hmac文件相关处理 #### buildupload命令新增支持通过scp方式归档构建数据 #### plume update-release-index命令新增支持通过https和scp的方式更新release index文件 #### 新增指令cmd-rollout diff --git a/src/gf-mksquashfs b/src/gf-mksquashfs index fc30a76a478345242a7b80b63378007347a6cb66..e8a24aec7e2898303b9bb5b2f81fd05b8f691020 100755 --- a/src/gf-mksquashfs +++ b/src/gf-mksquashfs @@ -40,8 +40,13 @@ coreos_gf upload "${tmpd}/config.new" /ostree/repo/config # And ensure that the kernel binary and hmac file is in the place that dracut # expects it to be; xref https://issues.redhat.com/browse/OCPBUGS-15843 kernel_binary=$(coreos_gf glob-expand /boot/ostree/*/vmlinuz*) -kernel_hmac=$(coreos_gf glob-expand /boot/ostree/*/.*.hmac) -coreos_gf ln "${kernel_hmac}" "/boot/$(basename "${kernel_hmac}")" + +# openEuler kernel currently do not support FIPS, and NestOS will maintain the status quo. Resulting in: +# 1.The following file processing is not currently required +# 2.To enable, the kernel package should provide the file /lib/modules/$kver/.vmlinuz.hmac + +# kernel_hmac=$(coreos_gf glob-expand /boot/ostree/*/.*.hmac) +# coreos_gf ln "${kernel_hmac}" "/boot/$(basename "${kernel_hmac}")" coreos_gf ln "${kernel_binary}" "/boot/$(basename "${kernel_binary}")" coreos_gf mksquashfs / "${tmp_dest}" "compress:${compression}"