summary |
shortlog |
log |
commit | commitdiff |
review |
tree
raw |
patch |
inline | side by side (from parent 1:
0ecd1ca)
Closes-bug: #
1587960
Change-Id: I0091f8644ef15f5b14fa2dbab4c866ab1507acb1
CONFIG=/etc/cirros-init/configdrive
NAME="${0##*/}"
LABEL="config-2"
CONFIG=/etc/cirros-init/configdrive
NAME="${0##*/}"
LABEL="config-2"
SEED_PRE_D="/var/lib/cloud/seed/configdrive-pre"
SEED_POST_D="/var/lib/cloud/seed/configdrive"
SEED_PRE_D="/var/lib/cloud/seed/configdrive-pre"
SEED_POST_D="/var/lib/cloud/seed/configdrive"
local out_d="$1"
local devlist="" num="" found="" fstree_d=""
local raw_d="" dev="" rdir="" mdjson="" ud="" found=""
local out_d="$1"
local devlist="" num="" found="" fstree_d=""
local raw_d="" dev="" rdir="" mdjson="" ud="" found=""
- find_devs_with "LABEL=$LABEL" ||
+ find_devs_with "LABEL=$LABEL" && [ -n "${_RET}" ] ||
+ find_devs_with "LABEL=$LABEL_ALT" ||
{ error "failed to find devs"; return 1; }
devlist=${_RET}
{ error "failed to find devs"; return 1; }
devlist=${_RET}
if [ -f "$mdjson" ]; then
json2fstree "$fstree_d" "$mdjson" ||
fail "json2fstree failed on $mdjson for $dev"
if [ -f "$mdjson" ]; then
json2fstree "$fstree_d" "$mdjson" ||
fail "json2fstree failed on $mdjson for $dev"
- ud="$rdir/openstack/latest/user_data"
+ ud="$rdir/openstack/latest/user_data"
[ -f "$ud" ] && cp "$ud" "$fstree_d/user-data"
found="$dev"
mv "$rdir" "$raw_d" ||
[ -f "$ud" ] && cp "$ud" "$fstree_d/user-data"
found="$dev"
mv "$rdir" "$raw_d" ||
+cirros-testvm (0.3.4-2~u14.04+mos5) mos; urgency=medium
+
+ * Fix for file injection is broken on centos computes with Cirros images
+ LP#1571704
+
+ -- Albert Syriy <asyriy@mirantis.com> Mon, 2 Jun 2016 17:55:15 +0200
+
cirros-testvm (0.3.4-2~u14.04+mos4) mos9.0; urgency=medium
* Add image size up to 48M due to the LP#1571704
cirros-testvm (0.3.4-2~u14.04+mos4) mos9.0; urgency=medium
* Add image size up to 48M due to the LP#1571704