Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Attempt to unmount target before stopping with error message #24

Merged
merged 3 commits into from
Feb 27, 2021
Merged

Attempt to unmount target before stopping with error message #24

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
702fdb4
Attempt to unmount target before stopping with error message.
jacobgkau Feb 17, 2021
ba83a46
Add warning message about partition(s) being unmounted.
jacobgkau Feb 18, 2021
c6966f3
Correct typo in FAT32 size limitation warning.
jacobgkau Feb 18, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 7 additions & 3 deletions WoeUSB/utils.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ def check_runtime_dependencies(application_name):
"""
result = "success"

system_commands = ["mount", "wipefs", "lsblk", "blockdev", "df", "parted", "7z"]
system_commands = ["mount", "umount", "wipefs", "lsblk", "blockdev", "df", "parted", "7z"]
for command in system_commands:
if shutil.which(command) is None:
print_with_color(
Expand Down Expand Up @@ -132,7 +132,11 @@ def check_is_target_device_busy(device):
"""
mount = subprocess.run("mount", stdout=subprocess.PIPE).stdout.decode("utf-8").strip()
if re.findall(device, mount) != []:
return 1
mounts = re.findall(rf'{device}\S*', mount)
print_with_color(_("Warning: The following partitions will be unmounted: {0}").format(mounts), "yellow")
for partition in mounts:
if subprocess.run(["umount", partition]).returncode:
return 1
return 0


Expand Down Expand Up @@ -173,7 +177,7 @@ def check_fat32_filesize_limitation(source_fs_mountpoint):
if os.path.getsize(path) > (2 ** 32) - 1: # Max fat32 file size
print_with_color(
_(
"Warining: File {0} in source image has exceed the FAT32 Filesystem 4GiB Single File Size Limitation, swiching to NTFS filesystem.").format(
"Warning: File {0} in source image has exceed the FAT32 Filesystem 4GiB Single File Size Limitation, swiching to NTFS filesystem.").format(
path),
"yellow")
print_with_color(
Expand Down