Skip to content

Commit

Permalink
Merge pull request #215 from KCSesh/test-mmap-fix
Browse files Browse the repository at this point in the history
Revert "add default security settings" due to bottlerocket-os/bottlerocket 1.26.0 release
  • Loading branch information
KCSesh authored Oct 24, 2024
2 parents 2ada9d3 + 7c95edd commit 65ba1e2
Show file tree
Hide file tree
Showing 2 changed files with 0 additions and 7 deletions.
5 changes: 0 additions & 5 deletions packages/release/release.spec
Original file line number Diff line number Diff line change
Expand Up @@ -87,7 +87,6 @@ Source1100: systemd-tmpfiles-setup-service-debug.conf
Source1101: systemd-resolved-service-env.conf
Source1102: systemd-networkd-service-env.conf
Source1103: systemd-logind-inhibit-maxdelay.conf
Source1104: systemd-service-security.conf

# network link rules
Source1200: 80-release.link
Expand Down Expand Up @@ -208,9 +207,6 @@ install -d %{buildroot}%{_cross_unitdir}/systemd-networkd.service.d
install -p -m 0644 %{S:1102} \
%{buildroot}%{_cross_unitdir}/systemd-networkd.service.d/00-env.conf

install -d %{buildroot}%{_cross_unitdir}/service.d/
install -p -m 0644 %{S:1104} %{buildroot}%{_cross_unitdir}/service.d/10-security.conf

# Empty (but packaged) directory. The FIPS packages for kernels will add drop-ins to
# this directory to arrange for the right modules to be loaded before the check runs.
install -d %{buildroot}%{_cross_unitdir}/check-fips-modules.service.d
Expand Down Expand Up @@ -316,7 +312,6 @@ ln -s preconfigured.target %{buildroot}%{_cross_unitdir}/default.target
%{_cross_unitdir}/prepare-local-fs.service
%{_cross_unitdir}/deprecation-warning@.service
%{_cross_unitdir}/deprecation-warning@.timer
%{_cross_unitdir}/service.d/10-security.conf
%dir %{_cross_unitdir}/systemd-resolved.service.d
%{_cross_unitdir}/systemd-resolved.service.d/00-env.conf
%dir %{_cross_unitdir}/systemd-networkd.service.d
Expand Down
2 changes: 0 additions & 2 deletions packages/release/systemd-service-security.conf

This file was deleted.

0 comments on commit 65ba1e2

Please sign in to comment.