shaba/one
1
0
Fork 0
mirror of https://github.com/OpenNebula/one.git synced 2025-03-21 14:50:08 +03:00
Code Releases Wiki Activity

development: Fix for dowloader.sh

Browse Source
This commit is contained in:
Ruben S. Montero 2018-12-17 18:45:38 +01:00
parent 8f770916a7
commit d772353877
2 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/datastore_mad/remotes/lxd_downloader.sh
View File

@ -102,7 +102,7 @@ selected_tag=get_tag_name
for p in ${arguments//&/ }; do
kvp=( ${p/=/ } );
k=${kvp[0]};v=${kvp[1]};
eval $k=$v;
[ -n "$k" -a -n "$v" ] && eval $k=$v;
done
extension="tar.xz"
@ -210,6 +210,8 @@ fi
#-------------------------------------------------------------------------------
[ -f $output ] && rm -f $output > /dev/null 2>&1
[ -n "$id" -a -d $TMP_DIR/$id ] && rm -rf $TMP_DIR/$id > /dev/null 2>&1
[ -f $output_raw ] rm -f $output_raw > /dev/null 2>&1
[ -f $output_qcow ] rm -f $output_qcow > /dev/null 2>&1
[ -f $output_raw ] && rm -f $output_raw > /dev/null 2>&1
[ -f $output_qcow ] && rm -f $output_qcow > /dev/null 2>&1
exit 0

6
src/mad/sh/create_container_image.sh
View File

@ -19,6 +19,10 @@
#-------------------------------------------------------------------------------
# Configuration attributes and parameters
#-------------------------------------------------------------------------------
USER=oneadmin
GROUP=oneadmin
DRIVER_PATH=$(dirname $0)
tmp_dir=$1
@ -41,7 +45,7 @@ esac
# Mount container disk image and untar rootfs contents to it
#-------------------------------------------------------------------------------
mount $tmp_dir/$id.raw $tmp_dir/$id
chown oneadmin:oneadmin $tmp_dir/$id
chown $USER:$GROUP $tmp_dir/$id
tar $untar_options $tmp_dir/$id.$extension -C $tmp_dir/$id > /dev/null 2>&1
sync