libburnia/libisoburn
2
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fixed the test for mounted devices after umount. Regression by 8fee0fc.

Browse Source
This commit is contained in:
Thomas Schmitt 2019-12-16 13:11:55 +01:00
parent 93ebe301f7
commit 42df8f913c
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
xorriso-dd-target/xorriso-dd-target
View File

@ -651,6 +651,7 @@ xdt_list_mounted_of() {
} }
## Unmount xdt_mounted_devs (maybe filled by xdt_list_mounted_of) ## Unmount xdt_mounted_devs (maybe filled by xdt_list_mounted_of)
## $1 : base device name
xdt_unmount() { xdt_unmount() {
if test -z "$xdt_mounted_devs" if test -z "$xdt_mounted_devs"
then then
@ -674,7 +675,7 @@ xdt_unmount() {
# Check again if any mount points still exist # Check again if any mount points still exist
if test -z "$xdt_dummy_run" if test -z "$xdt_dummy_run"
then then
xdt_list_mounted_of "$2" xdt_list_mounted_of "$1"
if test -n "$xdt_mounted_devs" if test -n "$xdt_mounted_devs"
then then
echo "FAILURE: $xdt_sudo_cmd $xdt_umount_cmd could not remove all mounts: $xdt_mounted_devs" >&2 echo "FAILURE: $xdt_sudo_cmd $xdt_umount_cmd could not remove all mounts: $xdt_mounted_devs" >&2
@ -685,6 +686,8 @@ xdt_unmount() {
} }
## Does the work of unmounting and dd-ing ## Does the work of unmounting and dd-ing
## $1 : image file path
## $2 : base device name
xdt_write_image() { xdt_write_image() {
if test -z "$xdt_umount_cmd" if test -z "$xdt_umount_cmd"
@ -705,7 +708,7 @@ xdt_write_image() {
echo "Would do if not -dummy:" echo "Would do if not -dummy:"
fi fi
xdt_unmount || return "$?" xdt_unmount "$2" || return "$?"
if test -z "$xdt_dd_cmd" if test -z "$xdt_dd_cmd"
then then