Skip to content

Commit 827ca98

Browse files
authored
Remove all references to old dm-verity boot tooling [3/3] (#10975)
1 parent 3aff143 commit 827ca98

12 files changed

Lines changed: 8 additions & 843 deletions

File tree

.github/workflows/validate-cg-manifest.sh

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,6 @@ ignore_no_source_tarball=" \
5252
python-rpm-generators \
5353
qt-rpm-macros \
5454
sgx-backwards-compatibility \
55-
verity-read-only-root \
5655
web-assets \
5756
"
5857

LICENSES-AND-NOTICES/SPECS/LICENSES-MAP.md

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

LICENSES-AND-NOTICES/SPECS/data/licenses.json

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2434,7 +2434,6 @@
24342434
"usrsctp",
24352435
"vala",
24362436
"valkey",
2437-
"verity-read-only-root",
24382437
"vnstat",
24392438
"zstd"
24402439
]

SPECS/initramfs/initramfs.spec

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
Summary: initramfs
22
Name: initramfs
33
Version: 3.0
4-
Release: 4%{?dist}
4+
Release: 5%{?dist}
55
License: Apache License
66
Vendor: Microsoft Corporation
77
Distribution: Azure Linux
@@ -19,7 +19,7 @@ mkdir -p %{buildroot}%{_sysconfdir}/dracut.conf.d
1919
install -D -m644 %{SOURCE0} %{buildroot}%{_sysconfdir}/dracut.conf.d/
2020

2121
%define watched_path %{_sbindir} %{_libdir}/udev/rules.d %{_libdir}/systemd/system /lib/modules %{_sysconfdir}/dracut.conf.d
22-
%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
22+
%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
2323

2424
%define removal_action() rm -rf %{_localstatedir}/lib/rpm-state/initramfs
2525

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

114114
%changelog
115+
* Tue Jul 02 2024 Daniel McIlvaney <damcilva@microsoft.com> - 3.0-5
116+
- Remove old dm-verity boot support
117+
115118
* Thu Mar 23 2024 Cameron Baird <cameronbaird@microsoft.com> - 3.0-4
116119
- Flag all dracut driver list configs as watched pkgs for initramfs regen
117120

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

131134
* Fri Oct 06 2023 Cameron Baird <cameronbaird@microsoft.com> - 2.0-14
132135
- Ensure grub2-mkconfig is called after the initramfs generation
133-
- Deprecate old linuxloader; no longer copy initrd image to efi partition
136+
- Deprecate old linuxloader; no longer copy initrd image to efi partition
134137

135138
* Wed Jun 28 2023 Cameron Baird <cameronbaird@microsoft.com> - 2.0-13
136139
- Copy the initrd image to /boot/efi to maintain backwards compatibility
137-
with the old linuxloader. Let the initrd remain in /boot as well.
140+
with the old linuxloader. Let the initrd remain in /boot as well.
138141

139142
* Fri Apr 07 2023 Andy Zaugg <azaugg@linkedin.com> - 2.0-12
140143
- Added fsck.xfs into initrd

SPECS/verity-read-only-root/20verity-mount/module-setup.sh

Lines changed: 0 additions & 26 deletions
This file was deleted.

0 commit comments

Comments
 (0)