Change Ubuntu 22.* error code for mountpoint

firesim · Aug 29, 2024 · 8cea603 · 8cea603
1 parent 8dd1c18
commit 8cea603
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/wlutil/wlutil.py b/wlutil/wlutil.py
@@ -595,8 +595,8 @@ def mountImg(imgPath, mntPath):
 
     assert imgPath.is_file(), f"Unable to find {imgPath} to mount"
     ret = run(["mountpoint", mntPath], check=False).returncode
-    # mountpoint on Ubuntu 20.* returns 1 (on 22.* it returns 130) for an empty folder
-    assert ret == 1 or ret == 130, f"{mntPath} already mounted. Somethings wrong"
+    # mountpoint on Ubuntu 20.* returns 1 (on 22.* it returns 32) for an empty folder
+    assert ret == 1 or ret == 32, f"{mntPath} already mounted. Somethings wrong"
 
     uid = sp.run(['id', '-u'], capture_output=True, text=True).stdout.strip()
     gid = sp.run(['id', '-g'], capture_output=True, text=True).stdout.strip()