Skip to content
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
7 changes: 7 additions & 0 deletions SPECS/systemd/systemd-journald-umount-fix.override.conf
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
# During shutdown,journald and umount.target are in conflict due to
# which mount failure logs are logged on console.
# so adding below entry to systemd-journald.service, to stop journald
# when system starts to unmount.
[Unit]
After=umount.target
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This tells systemd to start the systemd-journald.service only after the umount.target has been reached - where umount.target is part of the shutdown. This means systemd-journald.service won't be running during normal system uptime.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Hi @yepmunchun ,
I do see that systemd-journald.service is running during system uptime. verified through sudo systemctl status systemd-journald.service command and also observed logs are getting logged on execution i.e sudo journalctl -f. Attaching the log for reference.
journal.log

Conflicts=umount.target
1 change: 1 addition & 0 deletions SPECS/systemd/systemd.signatures.json
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@
"systemd-journal-gatewayd.xml": "c2559b1244fb04f7fe214628daf09e12d431560b069b5ef346ace1ceddbe1bc9",
"systemd-journal-remote.xml": "29a7ce0c161a99c0bb48ee6fd5def97d88c7d1c1dd776d4b4d93b6be0b6fdd9b",
"systemd-udev-trigger-no-reload.conf": "e22c23fb4618a2021322c5b68fc16b872a27fe8a3edb42e8abec83896eba835a",
"systemd-journald-umount-fix.override.conf": "e9b752f4f0abad24616e64cbb3af9ac0cf09ecb5a872e8f75e31647d3328f9f0",
"sysusers.attr": "49cffe66a7a366272e9ebac212f50dc9bc8d55aa6b4ef092fc87cb230bd50520",
"sysusers.generate-pre.sh": "6d503de2db2374125cb5c3b6034636514b58a38dcff193550768c3c49c6d7419",
"sysusers.prov": "0dcc4b699030c11eccedb850d4d2c097ebdc725766e17db56f942ee445b93cf6",
Expand Down
11 changes: 10 additions & 1 deletion SPECS/systemd/systemd.spec
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ Version: 255
# determine the build information from local checkout
Version: %(tools/meson-vcs-tag.sh . error | sed -r 's/-([0-9])/.^\1/; s/-g/_g/')
%endif
Release: 29%{?dist}
Release: 30%{?dist}

# FIXME - hardcode to 'stable' for now as that's what we have in our blobstore
%global stable 1
Expand Down Expand Up @@ -110,6 +110,7 @@ Source28: 99-yama-ptrace.conf
Source29: 99-net-core-bpf-jit-harden.conf
Source30: 99-kernel.conf
Source31: 99-tcp-timestamps.conf
Source32: systemd-journald-umount-fix.override.conf

%if 0
GIT_DIR=../../src/systemd/.git git format-patch-ab --no-signature -M -N v235..v235-stable
Expand Down Expand Up @@ -872,6 +873,9 @@ install -Dm0644 -t %{buildroot}%{_pkgdocdir}/ %{SOURCE28}
# https://bugzilla.redhat.com/show_bug.cgi?id=1378974
install -Dm0644 -t %{buildroot}%{system_unit_dir}/systemd-udev-trigger.service.d/ %{SOURCE10}

# systemd-journald.service override.conf file
install -Dm0644 -t %{buildroot}%{system_unit_dir}/systemd-journald.service.d/ %{SOURCE32}

# systemd-oomd default configuration
install -Dm0644 -t %{buildroot}%{_prefix}/lib/systemd/oomd.conf.d/ %{SOURCE14}
install -Dm0644 -t %{buildroot}%{system_unit_dir}/system.slice.d/ %{SOURCE15}
Expand Down Expand Up @@ -975,6 +979,7 @@ systemd-tmpfiles --create &>/dev/null || :
# https://fedoraproject.org/wiki/Changes/Systemd_presets_for_user_units.
systemctl preset-all &>/dev/null || :
systemctl --global preset-all &>/dev/null || :
systemctl daemon-reload &>/dev/null ||:

%postun
if [ $1 -eq 1 ]; then
Expand Down Expand Up @@ -1237,6 +1242,10 @@ rm -f %{name}.lang
# %autochangelog. So we need to continue manually maintaining the
# changelog here.
%changelog
* Tue Sep 17 2025 Basavaraj unniche <[email protected]> - 255-30
- Add systemd-journald-umount-fix.override.conf to fix conflict issues
- during unmounting /var.

* Fri May 30 2025 Ranjan Dutta <[email protected]> - 255-29
- merge from Azure Linux 3.0.20250521-3.0
- Bumping 'Release' tag to match the 'signed' version of the spec.
Expand Down
Loading