Skip to content
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
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
15 changes: 15 additions & 0 deletions data/data/agent/files/usr/local/bin/agent-copy-iso-files.sh
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/
Copy link
Contributor

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?

Copy link
Contributor Author

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


rm -rf "${AGENT_FILES_TEMP}"
12 changes: 12 additions & 0 deletions data/data/agent/systemd/units/agent-copy-iso-files.service
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
1 change: 1 addition & 0 deletions pkg/asset/agent/image/ignition.go
Original file line number Diff line number Diff line change
Expand Up @@ -214,6 +214,7 @@ func (a *Ignition) Generate(dependencies asset.Parents) error {
}

agentEnabledServices := []string{
"agent-copy-iso-files.service",
"agent.service",
"agent-tui.path",
"assisted-service-db.service",
Expand Down
1 change: 1 addition & 0 deletions pkg/asset/agent/image/ignition_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -390,6 +390,7 @@ metadata:
"/usr/local/bin/common.sh",
"/usr/local/bin/agent-gather",
"/usr/local/bin/agent-interactive-console.sh",
"/usr/local/bin/agent-copy-iso-files.sh",
"/usr/local/bin/extract-agent.sh",
"/usr/local/bin/get-container-images.sh",
"/usr/local/bin/install-status.sh",
Expand Down