Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 4a7e59a1 authored by Brint E. Kriebel's avatar Brint E. Kriebel Committed by Steve Kondik
Browse files

releasetools: Use the first entry of a mount point when reading fstab 

There may be multiple entries in fstab for a mount point. Use the first
value found so the entries are prioritized in order.

Change-Id: Ibd2631413d3e00507d3a0ec84fb91755f1c7993c
Ticket: OPO-326
parent e295282d

tools/releasetools/common.py

+8 −6
Original line number Diff line number Diff line
@@ -349,6 +349,7 @@ def LoadRecoveryFSTab(read_helper, fstab_version, type, system_root_image=False) 
          else:

            print("%s: unknown option \"%s\"" % (mount_point, i))



      if not d.get(mount_point):

          d[mount_point] = Partition(mount_point=mount_point, fs_type=pieces[1],

                                     device=pieces[2], length=length,

                                     device2=device2)
@@ -387,6 +388,7 @@ def LoadRecoveryFSTab(read_helper, fstab_version, type, system_root_image=False) 
          context = i



      mount_point = pieces[1]

      if not d.get(mount_point):

          d[mount_point] = Partition(mount_point=mount_point, fs_type=pieces[2],

                                     device=pieces[0], length=length,

                                     device2=None, context=context)