Skip to content

init: add ability to use existing ISO/sha256sum #210

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

Merged
cgwalters merged 1 commit into from
Nov 13, 2018
Merged

init: add ability to use existing ISO/sha256sum #210

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
44 changes: 34 additions & 10 deletions src/cmd-init
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,13 +5,14 @@ dn=$(dirname "$0")
# shellcheck source=src/cmdlib.sh
. "${dn}"/cmdlib.sh

# Initialize FORCE to 0
# Initialize FORCE to 0 and INSTALLER_DIR to null
FORCE=0
INSTALLER_DIR=""

print_help() {
cat 1>&2 <<'EOF'
Usage: coreos-assembler init --help
coreos-assembler init [--force] GITCONFIG [SUBDIR]
coreos-assembler init [--force] [--installerdir INSTALLER_DIR] GITCONFIG [SUBDIR]

For example, you can use https://github.com/coreos/fedora-coreos-config
as GITCONFIG, or fork it. Another option useful for local development
Expand All @@ -20,12 +21,15 @@ Usage: coreos-assembler init --help

If specified, SUBDIR is a subdirectory of the git repository that should
contain manifest.yaml and image.ks.

If you have the required install ISO and sha256sums already availble,
you can specify the location of the those files with the `--installerdir` flag.
EOF
}

# Call getopt to validate the provided input.
rc=0
options=$(getopt --options hf --longoptions help,force -- "$@") || rc=$?
options=$(getopt --options hfi: --longoptions help,force,installerdir: -- "$@") || rc=$?
[ $rc -eq 0 ] || {
print_help
exit 1
Expand All @@ -40,6 +44,15 @@ while true; do
-f | --force)
FORCE=1
;;
-i | --installerdir)
case "$2" in
"")
shift ;;
*)
INSTALLER_DIR="$2"
shift ;;
esac
;;
--)
shift
break
Expand Down Expand Up @@ -100,20 +113,31 @@ mkdir -p src
fi
fi)


installer_bn=$(basename ${INSTALLER})
checksums_bn=$(basename ${INSTALLER_CHECKSUM})
mkdir -p installer

if [ -n "${INSTALLER_DIR}" ] && [ "${FORCE}" != "1" ]; then
if (cd "${INSTALLER_DIR}" && sha256sum -c "${checksums_bn}"); then
(cd installer
cp --reflink=auto "${INSTALLER_DIR}"/"${installer_bn}" .
cp --reflink=auto "${INSTALLER_DIR}"/"${checksums_bn}" .
Copy link
Copy Markdown
Member

@jlebon jlebon Nov 19, 2018

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Though why even copy it? We could just ln -s here, right? There's precedence at least doing this with how we handle local paths to checkouts of fedora-coreos-config.

Copy link
Copy Markdown
Member

@cgwalters cgwalters Nov 19, 2018

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think really we want ln and then fall back to cp --reflink=auto, like what ostree does.

But in the end we're going to be dropping Anaconda hopefully soon anyways...

)
fi
fi

(cd installer
installer_bn=$(basename ${INSTALLER})
if ! [ -f "${installer_bn}" ]; then
mkdir -p tmp
(
mkdir -p tmp
(
cd tmp
curl -L --remote-name-all ${INSTALLER} ${INSTALLER_CHECKSUM}
checksums_bn=$(basename ${INSTALLER_CHECKSUM})
sha256sum -c "${checksums_bn}"
mv "${installer_bn}" "${checksums_bn}" ..
)
rm tmp -rf
fi
)
rm tmp -rf
fi
)

mkdir -p cache
Expand Down