@@ -108,15 +108,29 @@ cmd
108108install
109109 :suite: install LXC suite, includes morty & filtron
110110
111−Images of the LXC suite:
112−$(echo " ${LOCAL_IMAGES[*]}" | $FMT)
111+EOF
112+ usage_images
113+ echo
114+ usage_containers
115+ echo
116+ [ -n "${1+x}" ] && err_msg "$1"
117+}
113118
114−Containers of the LXC suite:
119+usage_containers() {
120+ cat <<EOF
121+LXC suite containers:
115122$(echo " ${CONTAINERS[*]}" | $FMT)
116123EOF
117124 [ -n "${1+x}" ] && err_msg "$1"
118125}
119126
127+usage_images() {
128+ cat <<EOF
129+LXC suite images:
130+$(echo " ${LOCAL_IMAGES[*]}" | $FMT)
131+EOF
132+}
133+
120134lxd_info() {
121135
122136 cat <<EOF
@@ -164,11 +178,12 @@ main() {
164178 images) lxc_delete_images_localy ;;
165179 subordinate) echo; del_subordinate_ids ;;
166180 ${LXC_HOST_PREFIX}-*)
181+ ! lxc_exists "$2" && usage_containers "unknown container: $2" && exit 42
167182 if ask_yn "Do you really want to delete conatiner $2"; then
168183 lxc_delete_container "$2"
169184 fi
170185 ;;
171− *) usage "unknown (or mising) container <name> $2"; exit 42;;
186+ *) usage "uknown or missing container <name> $2"; exit 42;;
172187 esac
173188 ;;
174189 add)
@@ -183,10 +198,11 @@ main() {
183198 case $2 in
184199 ''|containers) lxc_cmd "$1" ;;
185200 ${LXC_HOST_PREFIX}-*)
201+ ! lxc_exists "$2" && usage_containers "unknown container: $2" && exit 42
186202 info_msg "lxc $1 $2"
187203 lxc "$1" "$2" | prefix_stdout "[${_BBlue}${i}${_creset}] "
188204 ;;
189− *) usage "ukknown or missing container <name> $2"; exit 42;;
205+ *) usage "uknown or missing container <name> $2"; exit 42;;
190206 esac
191207 ;;
192208 show)
@@ -225,13 +241,12 @@ main() {
225241 done
226242 ;;
227243 ${LXC_HOST_PREFIX}-*)
244+ ! lxc_exists "$1" && usage_containers "unknown container: $1" && exit 42
228245 local name=$1
229246 shift
230247 lxc_exec_cmd "${name}" "$@"
231248 ;;
232−
233− *) usage "unknown <name>: $1"; exit 42
234− ;;
249+ *) usage "uknown or missing container <name> $2"; exit 42;;
235250 esac
236251 ;;
237252 install)
@@ -351,6 +366,7 @@ show_suite(){
351366 else
352367 lxc exec -t "${i}" -- "${LXC_REPO_ROOT}/utils/lxc.sh" __show suite \
353368 | prefix_stdout "[${_BBlue}${i}${_creset}] "
369+ echo
354370 fi
355371 done
356372}
@@ -384,12 +400,12 @@ lxc_exec_cmd() {
384400 shift
385401 exit_val=
386402 info_msg "[${_BBlue}${name}${_creset}] ${_BGreen}${*}${_creset}"
387− lxc exec "${name}" -- "$@"
403+ lxc exec --cwd "${LXC_REPO_ROOT}" "${name}" -- "$@"
388404 exit_val=$?
389405 if [[ $exit_val -ne 0 ]]; then
390− warn_msg "[${_BBlue}${i}${_creset}] exit code (${_BRed}${exit_val}${_creset}) from ${_BGreen}${*}${_creset}"
406+ warn_msg "[${_BBlue}${name}${_creset}] exit code (${_BRed}${exit_val}${_creset}) from ${_BGreen}${*}${_creset}"
391407 else
392− info_msg "[${_BBlue}${i}${_creset}] exit code (${exit_val}) from ${_BGreen}${*}${_creset}"
408+ info_msg "[${_BBlue}${name}${_creset}] exit code (${exit_val}) from ${_BGreen}${*}${_creset}"
393409 fi
394410 echo
395411}