Merge pull request #293 from SUSE/fix_reading_fstab

Open fstab file only if it exists
SUSE · Oct 21, 2024 · d74b965 · d74b965
2 parents 646dc37 + 0ec4bd2
commit d74b965
Showing 1 changed file with 52 additions and 51 deletions.
diff --git a/suse_migration_services/fstab.py b/suse_migration_services/fstab.py
@@ -50,59 +50,60 @@ def read(self, filename):
         :param string filename: path to a fstab file
         """
         self.fstab = []
-        with open(filename) as fstab:
-            for line in fstab.readlines():
-                mount_record = line.split()
-                if not mount_record or mount_record[0].startswith('#') or \
-                        mount_record[2].lower() == 'none':
-                    continue
-                device = mount_record[0]
-                mountpoint = mount_record[1]
-                fstype = mount_record[2]
-                try:
-                    options = mount_record[3]
-                except IndexError:
-                    options = ''
-                eligible_for_mount = True
-                if fstype != 'swap':
-                    if mountpoint == '/':
-                        # the main rootfs mountpoint is mounted in an
-                        # extra operation and therefore flagged as being
-                        # not eligible for a mount operation when read
-                        # from this fstab instance
-                        eligible_for_mount = False
-                    if device.startswith('UUID'):
-                        device_path = ''.join(
-                            ['/dev/disk/by-uuid/', device.split('=')[1]]
-                        )
-                    elif device.startswith('LABEL'):
-                        device_path = ''.join(
-                            ['/dev/disk/by-label/', device.split('=')[1]]
-                        )
-                    elif device.startswith('PARTUUID'):
-                        device_path = ''.join(
-                            ['/dev/disk/by-partuuid/', device.split('=')[1]]
-                        )
-                    else:
-                        device_path = device
-
-                    if os.path.exists(device_path):
-                        self.fstab.append(
-                            self.fstab_entry_type(
-                                fstype=fstype,
-                                mountpoint=mountpoint,
-                                device=device_path,
-                                options=options,
-                                eligible_for_mount=eligible_for_mount
+        if os.path.exists(filename):
+            with open(filename) as fstab:
+                for line in fstab.readlines():
+                    mount_record = line.split()
+                    if not mount_record or mount_record[0].startswith('#') or \
+                            mount_record[2].lower() == 'none':
+                        continue
+                    device = mount_record[0]
+                    mountpoint = mount_record[1]
+                    fstype = mount_record[2]
+                    try:
+                        options = mount_record[3]
+                    except IndexError:
+                        options = ''
+                    eligible_for_mount = True
+                    if fstype != 'swap':
+                        if mountpoint == '/':
+                            # the main rootfs mountpoint is mounted in an
+                            # extra operation and therefore flagged as being
+                            # not eligible for a mount operation when read
+                            # from this fstab instance
+                            eligible_for_mount = False
+                        if device.startswith('UUID'):
+                            device_path = ''.join(
+                                ['/dev/disk/by-uuid/', device.split('=')[1]]
                             )
-                        )
-                    else:
-                        log.warning(
-                            'Device path {0} not found and skipped'.format(
-                                device_path
+                        elif device.startswith('LABEL'):
+                            device_path = ''.join(
+                                ['/dev/disk/by-label/', device.split('=')[1]]
                             )
-                        )
-                        continue
+                        elif device.startswith('PARTUUID'):
+                            device_path = ''.join(
+                                ['/dev/disk/by-partuuid/', device.split('=')[1]]
+                            )
+                        else:
+                            device_path = device
+
+                        if os.path.exists(device_path):
+                            self.fstab.append(
+                                self.fstab_entry_type(
+                                    fstype=fstype,
+                                    mountpoint=mountpoint,
+                                    device=device_path,
+                                    options=options,
+                                    eligible_for_mount=eligible_for_mount
+                                )
+                            )
+                        else:
+                            log.warning(
+                                'Device path {0} not found and skipped'.format(
+                                    device_path
+                                )
+                            )
+                            continue
 
     def add_entry(
         self, device, mountpoint, fstype=None, options=None,