Success!
I took a bit of a meandering path to get here, but I think conceptually this set of steps would work without the meandering. I offer no guarantees of course, but thought I’d share what I ended up doing (while filtering out the failed steps and associated restores.
- Backup via clone/rescuezilla!!!
- In Live Ubuntu/gparted
- Resize “rightmost” partition to make room for bigger ESP
- For each other partition, move to the right to fill the available space
- Probably good to validate everything is still OK at this point for Ubuntu and Windows boots
- Copy the contents of the EFI partition to a backup location
- In Live Ubuntu/gparted
- Capture the UUID/Serial Number of the current EFI partition
- Delete the current EFI partition
- Create new FAT32 partition
- I had to drop to terminal and reformat in order to get the UUID/serial number set properly:
mkdosfs -F 32 -i <saved UUID> /dev/xxxxx
- I had to drop to terminal and reformat in order to get the UUID/serial number set properly:
- Copy previously saved contents to the newly created EFI partition
- Set the flags to “boot”, “esp” & “no_automount”
- Cross fingers and test booting both Windows and Ubuntu