Remove duplicate systemd parameters from kernel-mshv cfg (#5733)
This commit is contained in:
Родитель
c823dfda09
Коммит
36ca05642d
|
@ -11,7 +11,7 @@
|
|||
Summary: Mariner kernel that has MSHV Host support
|
||||
Name: kernel-mshv
|
||||
Version: 5.15.110.mshv2
|
||||
Release: 3%{?dist}
|
||||
Release: 4%{?dist}
|
||||
License: GPLv2
|
||||
Group: Development/Tools
|
||||
Vendor: Microsoft Corporation
|
||||
|
@ -130,7 +130,7 @@ ln -s vmlinux-%{uname_r} %{buildroot}%{_libdir}/debug/lib/modules/%{uname_r}/vml
|
|||
|
||||
cat > %{buildroot}/boot/linux-%{uname_r}.cfg << "EOF"
|
||||
# GRUB Environment Block
|
||||
mariner_cmdline_mshv=rd.auto=1 lockdown=integrity sysctl.kernel.unprivileged_bpf_disabled=1 init=/lib/systemd/systemd ro no-vmw-sta crashkernel=128M net.ifnames=0 plymouth.enable=0 systemd.legacy_systemd_cgroup_controller=yes systemd.unified_cgroup_hierarchy=0 audit=0 console=ttyS0,115200n8 earlyprintk
|
||||
mariner_cmdline_mshv=rd.auto=1 lockdown=integrity sysctl.kernel.unprivileged_bpf_disabled=1 init=/lib/systemd/systemd ro no-vmw-sta crashkernel=128M audit=0 console=ttyS0,115200n8 earlyprintk
|
||||
mariner_linux_mshv=vmlinuz-%{uname_r}
|
||||
mariner_initrd_mshv=initrd.img-%{uname_r}
|
||||
EOF
|
||||
|
@ -236,6 +236,10 @@ ln -sf linux-%{uname_r}.cfg /boot/mariner-mshv.cfg
|
|||
%{_includedir}/perf/perf_dlfilter.h
|
||||
|
||||
%changelog
|
||||
* Thu Jun 22 2023 Cameron Baird <cameronbaird@microsoft.com> - 5.15.110.mshv2-4
|
||||
- Don't include duplicate systemd parameters in mariner-mshv.cfg; should be read from
|
||||
systemd.cfg which is packaged in systemd
|
||||
|
||||
* Tue May 30 2023 Cameron Baird <cameronbaird@microsoft.com> - 5.15.110.mshv2-3
|
||||
- Align mariner_cmdline_mshv with the working configuration from
|
||||
old loader's linuxloader.conf
|
||||
|
|
Загрузка…
Ссылка в новой задаче