Merge ~juliank/ubiquity:skip-esp-if-unconfigured into ubiquity:master

Proposed by Julian Andres Klode
Status: Merged
Merged at revision: 8fc26a40cb041f33d4ef11172695f9052229cb20
Proposed branch: ~juliank/ubiquity:skip-esp-if-unconfigured
Merge into: ubiquity:master
Diff against target: 13 lines (+1/-1)
1 file modified
scripts/plugininstall.py (+1/-1)
Reviewer Review Type Date Requested Status
Ubuntu Installer Team Pending
Review via email: mp+401119@code.launchpad.net
To post a comment you must log in.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1diff --git a/scripts/plugininstall.py b/scripts/plugininstall.py
2index 8e61579..0fb284e 100755
3--- a/scripts/plugininstall.py
4+++ b/scripts/plugininstall.py
5@@ -977,7 +977,7 @@ class Install(install_misc.InstallBase):
6 self.db.set('grub-installer/bootdev', response)
7 else:
8 break
9- if arch == 'amd64' and subarch != 'efi':
10+ if arch == 'amd64' and subarch != 'efi' and os.path.ismount("/target/boot/efi"):
11 dbfilter = grubinstaller.GrubInstaller(
12 None, self.db, extra_args=['amd64/efi'])
13 ret = dbfilter.run_command(auto_process=True)

Subscribers

People subscribed via source and target branches