Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Remove all references to old dm-verity boot tooling [3/3] #10975

Open
wants to merge 3 commits into
base: 3.0-dev
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion .github/workflows/validate-cg-manifest.sh
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,6 @@ ignore_no_source_tarball=" \
python-rpm-generators \
qt-rpm-macros \
sgx-backwards-compatibility \
verity-read-only-root \
web-assets \
"

Expand Down
2 changes: 1 addition & 1 deletion LICENSES-AND-NOTICES/SPECS/LICENSES-MAP.md

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 0 additions & 1 deletion LICENSES-AND-NOTICES/SPECS/data/licenses.json
Original file line number Diff line number Diff line change
Expand Up @@ -2434,7 +2434,6 @@
"usrsctp",
"vala",
"valkey",
"verity-read-only-root",
"vnstat",
"zstd"
]
Expand Down
11 changes: 7 additions & 4 deletions SPECS/initramfs/initramfs.spec
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
Summary: initramfs
Name: initramfs
Version: 3.0
Release: 4%{?dist}
Release: 5%{?dist}
License: Apache License
Vendor: Microsoft Corporation
Distribution: Azure Linux
Expand All @@ -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, dracut-hostonly, dracut-hyperv, dracut-overlayfs, dracut-virtio, dracut-vrf, dracut-xen
%define watched_pkgs e2fsprogs, systemd, kpartx, device-mapper-multipath, 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

Expand Down Expand Up @@ -112,6 +112,9 @@ echo "initramfs" %{version}-%{release} "postun" >&2
%{_sysconfdir}/dracut.conf.d/fscks.conf

%changelog
* Tue Jul 02 2024 Daniel McIlvaney <[email protected]> - 3.0-5
- Remove old dm-verity boot support

* Thu Mar 23 2024 Cameron Baird <[email protected]> - 3.0-4
- Flag all dracut driver list configs as watched pkgs for initramfs regen

Expand All @@ -130,11 +133,11 @@ echo "initramfs" %{version}-%{release} "postun" >&2

* Fri Oct 06 2023 Cameron Baird <[email protected]> - 2.0-14
- Ensure grub2-mkconfig is called after the initramfs generation
- Deprecate old linuxloader; no longer copy initrd image to efi partition
- Deprecate old linuxloader; no longer copy initrd image to efi partition

* Wed Jun 28 2023 Cameron Baird <[email protected]> - 2.0-13
- Copy the initrd image to /boot/efi to maintain backwards compatibility
with the old linuxloader. Let the initrd remain in /boot as well.
with the old linuxloader. Let the initrd remain in /boot as well.

* Fri Apr 07 2023 Andy Zaugg <[email protected]> - 2.0-12
- Added fsck.xfs into initrd
Expand Down
26 changes: 0 additions & 26 deletions SPECS/verity-read-only-root/20verity-mount/module-setup.sh

This file was deleted.

Loading
Loading