Skip to content

Commit

Permalink
Merge pull request #3451 from bcressey/resolved-not-to-synthesize-hos…
Browse files Browse the repository at this point in the history
…tname

disable synthesized hostname in systemd-resolved
  • Loading branch information
bcressey authored Sep 13, 2023
2 parents d78d10a + 173579b commit f050989
Show file tree
Hide file tree
Showing 2 changed files with 9 additions and 0 deletions.
7 changes: 7 additions & 0 deletions packages/release/release.spec
Original file line number Diff line number Diff line change
Expand Up @@ -73,6 +73,7 @@ Source1080: runtime.slice

# Drop-in units to override defaults
Source1100: systemd-tmpfiles-setup-service-debug.conf
Source1101: systemd-resolved-service-env.conf

# systemd-udevd default link
Source1200: 80-release.link
Expand Down Expand Up @@ -161,6 +162,10 @@ install -d %{buildroot}%{_cross_unitdir}/systemd-tmpfiles-setup.service.d
install -p -m 0644 %{S:1100} \
%{buildroot}%{_cross_unitdir}/systemd-tmpfiles-setup.service.d/00-debug.conf

install -d %{buildroot}%{_cross_unitdir}/systemd-resolved.service.d
install -p -m 0644 %{S:1101} \
%{buildroot}%{_cross_unitdir}/systemd-resolved.service.d/00-env.conf

LOWERPATH=$(systemd-escape --path %{_cross_sharedstatedir}/kernel-devel/.overlay/lower)
sed -e 's|PREFIX|%{_cross_prefix}|' %{S:1020} > ${LOWERPATH}.mount
install -p -m 0644 ${LOWERPATH}.mount %{buildroot}%{_cross_unitdir}
Expand Down Expand Up @@ -242,6 +247,8 @@ ln -s preconfigured.target %{buildroot}%{_cross_unitdir}/default.target
%{_cross_unitdir}/prepare-local-fs.service
%{_cross_unitdir}/[email protected]
%{_cross_unitdir}/[email protected]
%dir %{_cross_unitdir}/systemd-resolved.service.d
%{_cross_unitdir}/systemd-resolved.service.d/00-env.conf
%dir %{_cross_unitdir}/systemd-tmpfiles-setup.service.d
%{_cross_unitdir}/systemd-tmpfiles-setup.service.d/00-debug.conf
%dir %{_cross_templatedir}
Expand Down
2 changes: 2 additions & 0 deletions packages/release/systemd-resolved-service-env.conf
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
[Service]
Environment=SYSTEMD_RESOLVED_SYNTHESIZE_HOSTNAME=0

0 comments on commit f050989

Please sign in to comment.