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.

Sign up for GitHub

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

Only check for the manifest.yaml/image.yaml being used #3951

Merged
merged 3 commits into from
Nov 21, 2024
Merged

Only check for the manifest.yaml/image.yaml being used #3951

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
3a4eb6b
Delay check on default manifest and image files until we know they're…
Nov 19, 2024
97ebfae
Update error message when manifest.yaml or image.yaml are missing
mtalexan Nov 20, 2024
bf65116
More accurate error message.
Nov 20, 2024
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: 3 additions & 4 deletions src/cmd-init
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -179,10 +179,6 @@ mkdir -p src
# Default paths for manifest.yaml & image.yaml
manifest="src/config/manifest.yaml"
image="src/config/image.yaml"
if [[ ! -f "${manifest}" ]] || [[ ! -f "${image}" ]]; then
echo 1>&2 "Could not find default manifests (${manifest} & ${image})"
fatal "If you are using a custom configuration, be sure it has a manifest.yaml & image.yaml."
fi

# Select the variant if requested
if [[ -n "${VARIANT}" ]] && [[ "${VARIANT}" != "default" ]]; then
Expand All @@ -197,6 +193,9 @@ if [[ -n "${VARIANT}" ]] && [[ "${VARIANT}" != "default" ]]; then
"coreos-assembler.config-variant": "${VARIANT}"
}
EOF
elif [[ ! -f "${manifest}" ]] || [[ ! -f "${image}" ]]; then
echo 1>&2 "Could not find default manifests (${manifest} & ${image})"
fatal "Missing required manifest.yaml or image.yaml files."
fi

mkdir -p cache
Expand Down
Loading