From 058b321340e72e48558d552c84db1996cdb986c0 Mon Sep 17 00:00:00 2001 From: Nazarii Hnydyn Date: Tue, 30 Mar 2021 13:47:30 +0000 Subject: [PATCH 1/2] [fwutil]: Fix next image mount. Signed-off-by: Nazarii Hnydyn --- fwutil/lib.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/fwutil/lib.py b/fwutil/lib.py index 19d613cf77..b087b63996 100755 --- a/fwutil/lib.py +++ b/fwutil/lib.py @@ -210,7 +210,7 @@ class SquashFs(object): OVERLAY_MOUNTPOINT_TEMPLATE = "/tmp/image-{}-overlay" def __init__(self): - image_stem = self.next_image.lstrip(self.OS_PREFIX) + image_stem = self.next_image.replace(self.OS_PREFIX, EMPTY, 1) self.fs_path = self.FS_PATH_TEMPLATE.format(image_stem) self.fs_rw = self.FS_RW_TEMPLATE.format(image_stem) From d10741409772274e7756ad132efe584df019a00a Mon Sep 17 00:00:00 2001 From: Nazarii Hnydyn Date: Wed, 31 Mar 2021 14:38:46 +0000 Subject: [PATCH 2/2] [fwutil]: Fix review comments. Signed-off-by: Nazarii Hnydyn --- fwutil/lib.py | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/fwutil/lib.py b/fwutil/lib.py index b087b63996..d4623cf7ce 100755 --- a/fwutil/lib.py +++ b/fwutil/lib.py @@ -210,7 +210,10 @@ class SquashFs(object): OVERLAY_MOUNTPOINT_TEMPLATE = "/tmp/image-{}-overlay" def __init__(self): - image_stem = self.next_image.replace(self.OS_PREFIX, EMPTY, 1) + image_stem = self.next_image + + if image_stem.startswith(self.OS_PREFIX): + image_stem = image_stem[len(self.OS_PREFIX):] self.fs_path = self.FS_PATH_TEMPLATE.format(image_stem) self.fs_rw = self.FS_RW_TEMPLATE.format(image_stem) @@ -245,6 +248,9 @@ def mount_next_image_fs(self): ) subprocess.check_call(cmd, shell=True) + if not (os.path.exists(self.fs_rw) and os.path.exists(self.fs_work)): + return self.fs_mountpoint + os.mkdir(self.overlay_mountpoint) cmd = "mount -n -r -t overlay -o lowerdir={},upperdir={},workdir={} overlay {}".format( self.fs_mountpoint,