Qubes/core-admin
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

linux/block-snapshot: improve support for HVM domain

Browse Source 
Handle stubdomains (the same device will be removed twice).
Use target domain name instead of stubdomain name for committing
template changes.
This commit is contained in:
Marek Marczykowski-Górecki 2015-02-22 14:44:09 +01:00
parent fc439edf2f
commit bc9e4d1fe5
1 changed files with 11 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
linux/system-config/block-snapshot
View File

@ -135,11 +135,10 @@ case "$command" in
write_dev /dev/mapper/$dm_devname
fi
# Save domain name for template commit on device remove
domain=$(xenstore_read_default "$XENBUS_PATH/domain" '')
if [ -z "$domain" ]; then
domid=$(xenstore_read "$XENBUS_PATH/frontend-id")
domain=$(xl domname $domid)
fi
domid=$(xenstore_read "$XENBUS_PATH/frontend-id")
# Store name of target domain in case of stubdom
domid=$(xenstore_read_default "/local/domain/$domid/target" "$domid")
domain=$(xl domname $domid)
echo $domain > "$HOTPLUG_STORE-domain"
release_lock "block"
@ -212,7 +211,13 @@ case "$command" in
claim_lock "block"
use_count=$(dmsetup info $node|grep Open|awk '{print $3}')
use_count=$(dmsetup info $node 2>/dev/null|grep Open|awk '{print $3}')
if [ -z "$use_count" ]; then
log info "Device $node already removed"
release_lock "block"
exit 0
fi
# do not remove snapshot if snapshot origin is still present
if [ "${node/snapshot/}" != "$node" -a -e "/dev/mapper/origin-$(echo $node|cut -d- -f2)" ]; then