Skip to content

Account for changes in lsblk output #2

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
kiloreven wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Account for changes in lsblk output #2

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 9 additions & 7 deletions tailgraft.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,13 +27,15 @@ def find_user_data():
devices = lsblk_linux()['blockdevices']

for dev in devices:
if dev["mountpoint"] is not None and os.path.isfile(os.path.join(dev["mountpoint"], 'user-data')):
return os.path.join(dev["mountpoint"], 'user-data')

if dev["children"] is not None:
for mountpoint in dev["mountpoints"]:
if mountpoint is not None and os.path.isfile(os.path.join(mountpoint, 'user-data')):
return os.path.join(mountpoint, 'user-data')

if dev.get("children", None) is not None:
for child in dev["children"]:
if child["mountpoint"] is not None and os.path.isfile(os.path.join(child["mountpoint"], 'user-data')):
return os.path.join(child["mountpoint"], 'user-data')
for mountpoint in child["mountpoints"]:
if mountpoint is not None and os.path.isfile(os.path.join(mountpoint, 'user-data')):
return os.path.join(mountpoint, 'user-data')

for root, dirs, files in os.walk('/Volumes'):
for dir in dirs:
Expand Down Expand Up @@ -96,4 +98,4 @@ def main():


if __name__ == "__main__":
main()
main()