From 95d028a37b33ca9b72ddae73e4d88626f270f086 Mon Sep 17 00:00:00 2001
From: "Earle F. Philhower, III" <earlephilhower@yahoo.com>
Date: Thu, 27 May 2021 13:01:07 -0700
Subject: [PATCH] Try to mount RPI drive if not already present

Fixes #27

As @vslinuxdtnet discovered, sometimes the RPI firmware update emulated USB
stick does not get automounted under Linux.  Add logic to attempt to use
standard tools to mount it to the uploader, only tried if no drives are
detected normally.
---
 tools/uf2conv.py | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/tools/uf2conv.py b/tools/uf2conv.py
index 61561829..940d9ef0 100755
--- a/tools/uf2conv.py
+++ b/tools/uf2conv.py
@@ -33,6 +33,7 @@ import os
 import os.path
 import argparse
 import time
+import glob
 
 toolspath = os.path.dirname(os.path.realpath(__file__)).replace('\\', '/') # CWD in UNIX format
 try:
@@ -357,6 +358,13 @@ def main():
                 args.output = "flash." + ext
         else:
             drives = get_drives()
+            if (len(drives) == 0) and (sys.platform == "linux"):
+                rpidisk = glob.glob("/dev/disk/by-id/usb-RPI_RP2*-part1")
+                try:
+                    subprocess.run(["udisksctl", "mount", "--block-device", os.path.realpath(rpidisk[0])])
+                    drives = get_drives()
+                except:
+                    pass # If it fails, no problem since it was a heroic attempt
 
         if args.output:
             write_file(args.output, outbuf)
-- 
2.54.0