-
Notifications
You must be signed in to change notification settings - Fork 45
Add override.conf for systemd-journald service file. #446
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
Open
bunnichx
wants to merge
1
commit into
open-edge-platform:3.0-dev
Choose a base branch
from
bunnichx:fix-error-logs-reboot
base: 3.0-dev
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Changes from all commits
Commits
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
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 | ||
Conflicts=umount.target |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -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 | ||
|
@@ -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 | ||
|
@@ -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} | ||
|
@@ -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 | ||
|
@@ -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. | ||
|
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
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 theumount.target
has been reached - whereumount.target
is part of the shutdown. This meanssystemd-journald.service
won't be running during normal system uptime.There was a problem hiding this comment.
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