(RHEL-5956) install: don't translate unit instances to paths when reenabling them #306
+30
−2
Conversation
This file contains 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
For unit instances install_info_discover() returns path to the template, which then generates confusing errors when passed to do_unit_file_enable(): ~# build/systemctl --root=/tmp/systemctl-test.N9ysbz reenable [email protected] Unit name: [email protected]; p: /etc/systemd/system/[email protected] Removed "/tmp/systemctl-test.N9ysbz/etc/systemd/system/services.target.wants/[email protected]". Failed to reenable [email protected], destination unit services.target is a non-template unit. This can also be seen with a different reproducer using [email protected] and a simple bind mount to / - there's no error this time, but it tries to create a symlink for the default instance (from DefaultInstance=tty1), which is also incorrect: ~# SYSTEMD_LOG_LEVEL=debug systemctl --root /mnt/bindroot/ reenable [email protected] Symlink /mnt/bindroot/etc/systemd/system/getty.target.wants/[email protected] → /usr/lib/systemd/system/[email protected] already exists Follow-up to: 29a7c59 Resolves upstream issue #24740 (cherry picked from commit fe6e0cf) Resolves: RHEL-5956
github-actions
bot
changed the title
github-actions
bot
added
pr/needs-ci
Commit validationTracker - RHEL-5956 The following commits meet all requirements
Tracker validationSuccess🟢 Tracker RHEL-5956 has set desired product: Pull Request validationFailed🔴 Failed or pending checks - |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
For unit instances install_info_discover() returns path to the template, which then generates confusing errors when passed to do_unit_file_enable():
~# build/systemctl --root=/tmp/systemctl-test.N9ysbz reenable [email protected] Unit name: [email protected]; p: /etc/systemd/system/[email protected] Removed "/tmp/systemctl-test.N9ysbz/etc/systemd/system/services.target.wants/[email protected]". Failed to reenable [email protected], destination unit services.target is a non-template unit.
This can also be seen with a different reproducer using [email protected] and a simple bind mount to / - there's no error this time, but it tries to create a symlink for the default instance (from DefaultInstance=tty1), which is also incorrect:
~# SYSTEMD_LOG_LEVEL=debug systemctl --root /mnt/bindroot/ reenable [email protected] Symlink /mnt/bindroot/etc/systemd/system/getty.target.wants/[email protected] → /usr/lib/systemd/system/[email protected] already exists
Follow-up to: 29a7c59
Resolves upstream issue #24740
(cherry picked from commit fe6e0cf)
Resolves: RHEL-5956