-
Notifications
You must be signed in to change notification settings - Fork 1.4k
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
AGENT-506: Copy additional files on startup #6794
Closed
andfasano
wants to merge
1
commit into
openshift:master
from
andfasano:agent-copy-iso-extra-binaries
Closed
Changes from all commits
Commits
File filter
Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
There are no files selected for viewing
15 changes: 15 additions & 0 deletions
15
data/data/agent/files/usr/local/bin/agent-copy-iso-files.sh
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
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,15 @@ | ||
#!/bin/bash | ||
|
||
# ignition.img is a compressed cpio archive usually containing just the | ||
# config.ign file. In case of agent-based installation, it could be | ||
# enriched with additional files | ||
|
||
AGENT_FILES_TEMP="$(mktemp -d)" | ||
|
||
cd "${AGENT_FILES_TEMP}" || { echo "Temp folder creation failed"; exit 1; } | ||
zcat /run/media/iso/images/ignition.img | cpio -idmv | ||
|
||
# agent-tui is required by the agent-interactive-console.service | ||
cp agent-tui /usr/local/bin/ | ||
|
||
rm -rf "${AGENT_FILES_TEMP}" |
12 changes: 12 additions & 0 deletions
12
data/data/agent/systemd/units/agent-copy-iso-files.service
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
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,12 @@ | ||
[Unit] | ||
Description=Copy the additional files stored in the agent ISO during the boot | ||
After=network-pre.target NetworkManager.service pre-network-manager-config.service selinux.service | ||
Before=network.target network.service agent.service NetworkManager-wait-online.service | ||
|
||
andfasano marked this conversation as resolved.
Show resolved
Hide resolved
|
||
[Service] | ||
Type=oneshot | ||
RemainAfterExit=true | ||
ExecStart=/usr/local/bin/agent-copy-iso-files.sh | ||
|
||
[Install] | ||
WantedBy=multi-user.target |
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
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
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.
Is agent-tui already marked executable?
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.
That's my expectation when it will be extracted from the image where it's stored. I think the attribute should be preserved, if not we could add a chmod here