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

mkcloud: improve image cache usage #3428

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion scripts/lib/mkcloud-driver-libvirt.sh
Original file line number Diff line number Diff line change
Expand Up @@ -385,7 +385,7 @@ function libvirt_do_onhost_deploy_image()
if [[ ! $want_cached_images = 1 ]] ; then
[ -n $rsyncserver_fqdn ] || complain 95 "Missing RSYNC Server FQDN!"

safely rsync --compress --progress --inplace --archive --verbose \
safely rsync --progress --archive --verbose \
rsync://$rsyncserver_fqdn/$rsyncserver_images_dir/$image $cache_dir/
else
# In this case the image has to be supplied by other means than
Expand Down
2 changes: 1 addition & 1 deletion scripts/mkcloud
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ if [[ $debug_mkcloud = 1 ]] ; then
PS4='+(${BASH_SOURCE##*/}:${LINENO}) ${FUNCNAME[0]:+${FUNCNAME[0]}(): }'
fi

cache_dir_default=/var/cache/mkcloud/$cloud
cache_dir_default=/var/cache/mkcloud
[[ $UID != 0 ]] && cache_dir_default="${XDG_CACHE_HOME:-./cache}/mkcloud"
: ${cache_dir:=$cache_dir_default}
mkdir -p "$cache_dir"
Expand Down