timamsk/OpenCore-Legacy-Patcher
1
0
Fork 0
mirror of https://github.com/dortania/OpenCore-Legacy-Patcher.git synced 2026-06-20 06:10:00 +10:00
Code Issues Packages Projects Releases Wiki Activity

reroute_payloads.py: Only unmount our DMG on exit

Browse Source
This commit is contained in:
Mykola Grymalyuk
2022-05-19 15:29:21 -06:00
parent 526dbb5d8a
commit f437b9d921
1 changed files with 17 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
resources/reroute_payloads.py
+17 -7
View File
@@ -37,13 +37,13 @@ class reroute_payloads:
print("- Mounted payloads.dmg") print("- Mounted payloads.dmg")
self.constants.current_path = Path(self.temp_dir.name) self.constants.current_path = Path(self.temp_dir.name)
self.constants.payload_path = Path(self.temp_dir.name) / Path("payloads") self.constants.payload_path = Path(self.temp_dir.name) / Path("payloads")
atexit.register(self.unmount_active_dmgs) atexit.register(self.unmount_active_dmgs, unmount_all_active=False)
else: else:
print("- Failed to mount payloads.dmg") print("- Failed to mount payloads.dmg")
print(f"Output: {output.stdout.decode()}") print(f"Output: {output.stdout.decode()}")
print(f"Return Code: {output.returncode}") print(f"Return Code: {output.returncode}")
def unmount_active_dmgs(self): def unmount_active_dmgs(self, unmount_all_active=True):
# Find all DMGs that are mounted, and forcefully unmount them # Find all DMGs that are mounted, and forcefully unmount them
# If our disk image was previously mounted, we need to unmount it to use again # If our disk image was previously mounted, we need to unmount it to use again
# This can happen if we crash during a previous scession, however 'atexit' class should hopefully avoid this # This can happen if we crash during a previous scession, however 'atexit' class should hopefully avoid this
@@ -52,8 +52,18 @@ class reroute_payloads:
for image in dmg_info["images"]: for image in dmg_info["images"]:
if image["image-path"].endswith("payloads.dmg"): if image["image-path"].endswith("payloads.dmg"):
print(f"- Unmounting payloads.dmg") if unmount_all_active is False:
subprocess.run( # Check that only our personal payloads.dmg is unmounted
["hdiutil", "detach", image["system-entities"][0]["dev-entry"], "-force"], if "shadow-path" in image:
stdout=subprocess.PIPE, stderr=subprocess.STDOUT if self.temp_dir.name in image["shadow-path"]:
) print("- Unmounting personal payloads.dmg")
subprocess.run(
["hdiutil", "detach", image["system-entities"][0]["dev-entry"], "-force"],
stdout=subprocess.PIPE, stderr=subprocess.STDOUT
)
else:
print(f"- Unmounting payloads.dmg at: {image['system-entities'][0]['dev-entry']}")
subprocess.run(
["hdiutil", "detach", image["system-entities"][0]["dev-entry"], "-force"],
stdout=subprocess.PIPE, stderr=subprocess.STDOUT
)