@@ -55,14 +55,14 @@ usage() {
5555usage::
5656
5757 $(basename "$0") build [containers]
58− $(basename "$0") delete [containers|subordinate]
58+ $(basename "$0") remove [containers|subordinate]
5959 $(basename "$0") [start|stop] [containers]
6060 $(basename "$0") inspect [info|config]
6161 $(basename "$0") cmd ...
6262
63−build / delete
64− :containers: build and delete all LXC containers
65−add / delete
63+build / remove
64+ :containers: build and remove all LXC containers
65+add / remove
6666 :subordinate: lxd permission to map ${HOST_USER}'s user/group id through
6767start/stop
6868 :containers: start/stop of all containers
@@ -86,7 +86,7 @@ lxd_info() {
8686LXD is needed, to install run::
8787
8888 snap install lxd
89− lxc init --auto
89+ lxd init --auto
9090
9191EOF
9292}
@@ -112,10 +112,10 @@ main() {
112112 containers) build_instances ;;
113113 *) usage "$_usage"; exit 42;;
114114 esac ;;
115− delete)
115+ remove)
116116 sudo_or_exit
117117 case $2 in
118− containers) delete_instances ;;
118+ containers) remove_instances ;;
119119 subordinate) echo; del_subordinate_ids ;;
120120 *) usage "$_usage"; exit 42;;
121121 esac ;;
@@ -173,8 +173,8 @@ build_instances() {
173173 lxc list "$HOST_PREFIX"
174174}
175175
176−delete_instances() {
177− rst_title "Delete LXC instances"
176+remove_instances() {
177+ rst_title "Remove LXC instances"
178178 echo -en "\\nLXC containers(s)::\\n\\n ${LOCAL_IMAGES[*]}\\n" | $FMT
179179 if ask_yn "Do you really want to delete all images"; then
180180 lxc_delete_containers
@@ -219,12 +219,14 @@ lxc_cmd() {
219219}
220220
221221lxc_init_containers() {
222− for i in "${LOCAL_IMAGES[@]}"; do
223− if lxc info "$i" &>/dev/null; then
222+ local shortname
223+ for ((i=0; i<${#TEST_IMAGES[@]}; i+=2)); do
224+ shortname="${TEST_IMAGES[i+1]}"
225+ if lxc info "${HOST_PREFIX}-${shortname}" &>/dev/null; then
224226 info_msg "conatiner '$i' already exists"
225227 else
226228 info_msg "create conatiner instance: $i"
227− lxc init "local:$i" "$i"
229+ lxc init "local:${shortname}" "${HOST_PREFIX}-${shortname}"
228230 fi
229231 done
230232}