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

sys_patch_mount.py: Fix mount variable invocation

Browse Source
This commit is contained in:
Mykola Grymalyuk
2024-05-20 13:40:44 -06:00
parent ef68b43fc3
commit e91c76e88e
1 changed files with 7 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
opencore_legacy_patcher/sys_patch/sys_patch_mount.py
+7 -5
View File
@@ -105,6 +105,8 @@ class SysPatchMount:
return None return None
return "/System/Volumes/Update/mnt1" return "/System/Volumes/Update/mnt1"
return None
def _unmount_root_volume(self, ignore_errors: bool = True) -> bool: def _unmount_root_volume(self, ignore_errors: bool = True) -> bool:
""" """
@@ -116,10 +118,10 @@ class SysPatchMount:
args = ["/sbin/umount"] args = ["/sbin/umount"]
if self.xnu_major == os_data.os_data.catalina.value: if self.xnu_major == os_data.os_data.catalina.value:
args += ["-uw", "/"] args += ["-uw", self.mount_path]
if self.xnu_major >= os_data.os_data.big_sur.value: if self.xnu_major >= os_data.os_data.big_sur.value:
args += ["/System/Volumes/Update/mnt1"] args += [self.mount_path]
result = subprocess_wrapper.run_as_root(args, stdout=subprocess.PIPE, stderr=subprocess.STDOUT) result = subprocess_wrapper.run_as_root(args, stdout=subprocess.PIPE, stderr=subprocess.STDOUT)
if result.returncode != 0: if result.returncode != 0:
@@ -140,9 +142,9 @@ class SysPatchMount:
args = ["/usr/sbin/bless"] args = ["/usr/sbin/bless"]
if platform.machine() == "arm64" or self.rosetta_status is True: if platform.machine() == "arm64" or self.rosetta_status is True:
args += ["--mount", "/System/Volumes/Update/mnt1", "--create-snapshot"] args += ["--mount", self.mount_path, "--create-snapshot"]
else: else:
args += ["--folder", "/System/Volumes/Update/mnt1/System/Library/CoreServices", "--bootefi", "--create-snapshot"] args += ["--folder", f"{self.mount_path}/System/Library/CoreServices", "--bootefi", "--create-snapshot"]
result = subprocess_wrapper.run_as_root(args, stdout=subprocess.PIPE, stderr=subprocess.STDOUT) result = subprocess_wrapper.run_as_root(args, stdout=subprocess.PIPE, stderr=subprocess.STDOUT)
@@ -164,7 +166,7 @@ class SysPatchMount:
if self.xnu_major < os_data.os_data.big_sur.value: if self.xnu_major < os_data.os_data.big_sur.value:
return True return True
result = subprocess_wrapper.run_as_root(["/usr/sbin/bless", "--mount", self.mount_location, "--bootefi", "--last-sealed-snapshot"], stdout=subprocess.PIPE, stderr=subprocess.STDOUT) result = subprocess_wrapper.run_as_root(["/usr/sbin/bless", "--mount", self.mount_path, "--bootefi", "--last-sealed-snapshot"], stdout=subprocess.PIPE, stderr=subprocess.STDOUT)
if result.returncode != 0: if result.returncode != 0:
logging.error("Failed to revert APFS snapshot") logging.error("Failed to revert APFS snapshot")
subprocess_wrapper.log(result) subprocess_wrapper.log(result)