Avoided to show mount lines again after -dummy umount

This commit is contained in:
Thomas Schmitt 2019-12-03 10:34:19 +01:00
parent 74f05d33f5
commit 6de23e96de

View File

@ -260,7 +260,7 @@ plug_in_watcher() {
# <<< Mock-up to save USB socket wear-off by erasing items from old_device_list # <<< Mock-up to save USB socket wear-off by erasing items from old_device_list
# <<< Their presence in new_device_list will let them appear as fresh plugs # <<< Their presence in new_device_list will let them appear as fresh plugs
# old_device_list=' '$(echo -n $old_device_list | sed -e 's/sde//')' ' # old_device_list=' '$(echo -n $old_device_list | sed -e 's/sdc//')' '
echo "Found and noted as _not_ desired: $old_device_list" >&2 echo "Found and noted as _not_ desired: $old_device_list" >&2
echo >&2 echo >&2
@ -570,13 +570,16 @@ write_image() {
done done
# Check again if any mount points still exist # Check again if any mount points still exist
if test -z "$dummy_run"
then
list_mounted_of "$2" list_mounted_of "$2"
if test -n "$mounted_devs" -a -z "$dummy_run" if test -n "$mounted_devs"
then then
echo "FAILURE: $sudo_cmd $umount_cmd could not remove all mounts: $mounted_devs" >&2 echo "FAILURE: $sudo_cmd $umount_cmd could not remove all mounts: $mounted_devs" >&2
return 7 return 7
fi fi
fi fi
fi
if test -z "$dd_cmd" if test -z "$dd_cmd"
then then
@ -587,9 +590,9 @@ write_image() {
then then
echo " $sudo_cmd $dd_cmd if='${1}' bs=1M of=/dev/${2} ; sync" echo " $sudo_cmd $dd_cmd if='${1}' bs=1M of=/dev/${2} ; sync"
else else
echo "--- not activated yet ---" echo "Performing:"
echo "Would do: $sudo_cmd $dd_cmd if='${1}' bs=1M of=/dev/${2} ; sync" echo " $sudo_cmd $dd_cmd if='${1}' bs=1M of=/dev/${2} ; sync"
echo "--- not activated yet ---" # $sudo_cmd $dd_cmd if='${1}' bs=1M of=/dev/${2} ; sync
fi fi
# >>> ??? Erase possible GPT backup table at end of device ? # >>> ??? Erase possible GPT backup table at end of device ?
@ -651,7 +654,7 @@ then
then then
if test -n "$do_plug_test" if test -n "$do_plug_test"
then then
echo echo >&2
echo "Step 3:" >&2 echo "Step 3:" >&2
if test -n "$dummy_run" if test -n "$dummy_run"
then then