-
Notifications
You must be signed in to change notification settings - Fork 542
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Rework dracut defaults into separate subpackages for more granular im…
…age configuration (#9326) Co-authored-by: Chris Gunn <[email protected]>
- Loading branch information
Showing
30 changed files
with
139 additions
and
30 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,4 @@ | ||
# kdump currently uses the host system's initrd when enrolling a crash kernel | ||
# and initrd. There is a limitation where the kdump initrd must be generated | ||
# with dracut in hostonly mode. So, set hostonly as the default. | ||
hostonly=yes |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,2 @@ | ||
# VM guest drivers for Hyper-V. | ||
add_drivers+=" hv_utils hv_vmbus hv_storvsc hv_netvsc hv_sock hv_balloon " |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,2 @@ | ||
# VM guest drivers for virtio (e.g. KVM/QEMU). | ||
add_drivers+=" virtio_blk virtio-rng virtio_console virtio_crypto virtio_mem vmw_vsock_virtio_transport vmw_vsock_virtio_transport_common 9pnet_virtio " |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1 @@ | ||
add_drivers+=" vrf " |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,2 @@ | ||
# VM guest drivers for Xen. | ||
add_drivers+=" xen-scsifront xen-blkfront xen-evtchn xen-gntalloc xen-gntdev xen-privcmd xen-pciback xenfs " |
This file was deleted.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -4,7 +4,7 @@ | |
Summary: dracut to create initramfs | ||
Name: dracut | ||
Version: 059 | ||
Release: 18%{?dist} | ||
Release: 19%{?dist} | ||
# The entire source code is GPLv2+ | ||
# except install/* which is LGPLv2+ | ||
License: GPLv2+ AND LGPLv2+ | ||
|
@@ -18,7 +18,11 @@ Source1: https://www.gnu.org/licenses/lgpl-2.1.txt | |
Source3: megaraid.conf | ||
Source4: 20overlayfs/module-setup.sh | ||
Source5: 20overlayfs/overlayfs-mount.sh | ||
Source6: defaults.conf | ||
Source6: 00-hostonly.conf | ||
Source7: 00-hyperv.conf | ||
Source8: 00-virtio.conf | ||
Source9: 00-vrf.conf | ||
Source10: 00-xen.conf | ||
|
||
Patch: fix-functions-Avoid-calling-grep-with-PCRE-P.patch | ||
# allow-liveos-overlay-no-user-confirmation-prompt.patch has been introduced by | ||
|
@@ -75,6 +79,20 @@ Requires: nss | |
This package requires everything which is needed to build an | ||
initramfs with dracut, which does an integrity check. | ||
|
||
%package hostonly | ||
Summary: dracut configuration needed to build an initramfs with hostonly enabled | ||
Requires: %{name} = %{version}-%{release} | ||
|
||
%description hostonly | ||
This package contains dracut configuration needed to build an initramfs with hostonly enabled | ||
|
||
%package hyperv | ||
Summary: dracut configuration needed to build an initramfs with hyperv guest drivers | ||
Requires: %{name} = %{version}-%{release} | ||
|
||
%description hyperv | ||
This package contains dracut configuration needed to build an initramfs with hyperv guest drivers | ||
|
||
%package megaraid | ||
Summary: dracut configuration needed to build an initramfs with MegaRAID driver support | ||
Requires: %{name} = %{version}-%{release} | ||
|
@@ -96,6 +114,27 @@ Requires: %{name} = %{version}-%{release} | |
%description overlayfs | ||
This package contains dracut module needed to build an initramfs with OverlayFS support. | ||
|
||
%package virtio | ||
Summary: dracut configuration needed to build an initramfs with virtio guest drivers | ||
Requires: %{name} = %{version}-%{release} | ||
|
||
%description virtio | ||
This package contains dracut configuration needed to build an initramfs with virtio guest drivers | ||
|
||
%package vrf | ||
Summary: dracut configuration needed to build an initramfs with the vrf driver | ||
Requires: %{name} = %{version}-%{release} | ||
|
||
%description vrf | ||
This package contains dracut configuration needed to build an initramfs with the vrf driver | ||
|
||
%package xen | ||
Summary: dracut configuration needed to build an initramfs with xen guest drivers | ||
Requires: %{name} = %{version}-%{release} | ||
|
||
%description xen | ||
This package contains dracut configuration needed to build an initramfs with xen guest drivers | ||
|
||
%prep | ||
%autosetup -p1 | ||
cp %{SOURCE1} . | ||
|
@@ -134,7 +173,11 @@ install -m 0644 dracut.conf.d/fips.conf.example %{buildroot}%{_sysconfdir}/dracu | |
> %{buildroot}%{_sysconfdir}/system-fips | ||
|
||
install -m 0644 %{SOURCE3} %{buildroot}%{_sysconfdir}/dracut.conf.d/50-megaraid.conf | ||
install -m 0644 %{SOURCE6} %{buildroot}%{_sysconfdir}/dracut.conf.d/00-defaults.conf | ||
install -m 0644 %{SOURCE6} %{buildroot}%{_sysconfdir}/dracut.conf.d/00-hostonly.conf | ||
install -m 0644 %{SOURCE7} %{buildroot}%{_sysconfdir}/dracut.conf.d/00-hyperv.conf | ||
install -m 0644 %{SOURCE8} %{buildroot}%{_sysconfdir}/dracut.conf.d/00-virtio.conf | ||
install -m 0644 %{SOURCE9} %{buildroot}%{_sysconfdir}/dracut.conf.d/00-vrf.conf | ||
install -m 0644 %{SOURCE10} %{buildroot}%{_sysconfdir}/dracut.conf.d/00-xen.conf | ||
|
||
mkdir -p %{buildroot}%{dracutlibdir}/modules.d/20overlayfs/ | ||
install -p -m 0755 %{SOURCE4} %{buildroot}%{dracutlibdir}/modules.d/20overlayfs/ | ||
|
@@ -170,7 +213,6 @@ ln -srv %{buildroot}%{_bindir}/%{name} %{buildroot}%{_sbindir}/%{name} | |
%{dracutlibdir}/skipcpio | ||
%{dracutlibdir}/%{name}-util | ||
%config(noreplace) %{_sysconfdir}/%{name}.conf | ||
%config %{_sysconfdir}/dracut.conf.d/00-defaults.conf | ||
%dir %{_sysconfdir}/%{name}.conf.d | ||
%dir %{dracutlibdir}/%{name}.conf.d | ||
%dir %{_var}/opt/%{name}/log | ||
|
@@ -201,6 +243,14 @@ ln -srv %{buildroot}%{_bindir}/%{name} %{buildroot}%{_sbindir}/%{name} | |
%{_sysconfdir}/dracut.conf.d/40-fips.conf | ||
%config(missingok) %{_sysconfdir}/system-fips | ||
|
||
%files hostonly | ||
%defattr(-,root,root,0755) | ||
%{_sysconfdir}/dracut.conf.d/00-hostonly.conf | ||
|
||
%files hyperv | ||
%defattr(-,root,root,0755) | ||
%{_sysconfdir}/dracut.conf.d/00-hyperv.conf | ||
|
||
%files megaraid | ||
%defattr(-,root,root,0755) | ||
%{_sysconfdir}/dracut.conf.d/50-megaraid.conf | ||
|
@@ -212,12 +262,27 @@ ln -srv %{buildroot}%{_bindir}/%{name} %{buildroot}%{_sbindir}/%{name} | |
%dir %{dracutlibdir}/modules.d/20overlayfs | ||
%{dracutlibdir}/modules.d/20overlayfs/* | ||
|
||
%files virtio | ||
%defattr(-,root,root,0755) | ||
%{_sysconfdir}/dracut.conf.d/00-virtio.conf | ||
|
||
%files vrf | ||
%defattr(-,root,root,0755) | ||
%{_sysconfdir}/dracut.conf.d/00-vrf.conf | ||
|
||
%files xen | ||
%defattr(-,root,root,0755) | ||
%{_sysconfdir}/dracut.conf.d/00-xen.conf | ||
|
||
%{_bindir}/%{name}-catimages | ||
%dir /boot/%{name} | ||
%dir %{_sharedstatedir}/%{name} | ||
%dir %{_sharedstatedir}/%{name}/overlay | ||
|
||
%changelog | ||
* Thu May 30 2024 Chris Gunn <[email protected]> - 059-19 | ||
- Split defaults into separate subpackages: hostonly, hyperv, virtio, vrf, and xen | ||
|
||
* Tue May 28 2024 Cameron Baird <[email protected]> - 059-18 | ||
- Remove reference to zlib from dracut-fips module setup to address | ||
pedantic initramfs regeneration behavior | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,7 +1,7 @@ | ||
Summary: initramfs | ||
Name: initramfs | ||
Version: 3.0 | ||
Release: 3%{?dist} | ||
Release: 4%{?dist} | ||
License: Apache License | ||
Vendor: Microsoft Corporation | ||
Distribution: Azure Linux | ||
|
@@ -19,7 +19,7 @@ mkdir -p %{buildroot}%{_sysconfdir}/dracut.conf.d | |
install -D -m644 %{SOURCE0} %{buildroot}%{_sysconfdir}/dracut.conf.d/ | ||
|
||
%define watched_path %{_sbindir} %{_libdir}/udev/rules.d %{_libdir}/systemd/system /lib/modules %{_sysconfdir}/dracut.conf.d | ||
%define watched_pkgs e2fsprogs, systemd, kpartx, device-mapper-multipath, verity-read-only-root, dracut-fips, dracut-megaraid | ||
%define watched_pkgs e2fsprogs, systemd, kpartx, device-mapper-multipath, verity-read-only-root, dracut-fips, dracut-megaraid, dracut-hostonly, dracut-hyperv, dracut-overlayfs, dracut-virtio, dracut-vrf, dracut-xen | ||
|
||
%define removal_action() rm -rf %{_localstatedir}/lib/rpm-state/initramfs | ||
|
||
|
@@ -112,6 +112,9 @@ echo "initramfs" %{version}-%{release} "postun" >&2 | |
%{_sysconfdir}/dracut.conf.d/fscks.conf | ||
|
||
%changelog | ||
* Thu Mar 23 2024 Cameron Baird <[email protected]> - 3.0-4 | ||
- Flag all dracut driver list configs as watched pkgs for initramfs regen | ||
|
||
* Wed Mar 06 2024 Chris Gunn <[email protected]> - 3.0-3 | ||
- Remove /var/lib/initramfs/kernel files. | ||
|
||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -23,6 +23,8 @@ | |
"tdnf-plugin-repogpgcheck", | ||
"util-linux", | ||
"zlib", | ||
"dracut-hostonly", | ||
"dracut-vrf", | ||
"initramfs" | ||
] | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,5 +1,6 @@ | ||
{ | ||
"packages": [ | ||
"dracut-hyperv", | ||
"hyperv-daemons" | ||
] | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,5 +1,6 @@ | ||
{ | ||
"packages": [ | ||
"qemu-guest-agent" | ||
"qemu-guest-agent", | ||
"dracut-virtio" | ||
] | ||
} |
Oops, something went wrong.