Skip to content

feat(storage): add option to explicitly omit the bootloader installation #2126

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
aamkye wants to merge 5 commits into
base: main
Choose a base branch
from
Open

feat(storage): add option to explicitly omit the bootloader installation #2126

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
e70d289
feat(storage): add option to explicitly omit the bootloader
aamkye Jan 11, 2025
2dd9534
feat(storage): add new option for disk model
aamkye Jan 14, 2025
3755331
Merge branch 'canonical:main' into main
aamkye Jul 27, 2025
301f9db
temp fix
aamkye Jul 27, 2025
18ece3b
removed grub config
aamkye Jul 27, 2025
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
20 changes: 13 additions & 7 deletions subiquity/models/filesystem.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -800,6 +800,7 @@ class Disk(_Device):
preserve: bool = False
name: str = ""
grub_device: bool = False
skip_bootloader: bool = False
device_id: Optional[str] = None

_info: StorageInfo = attributes.for_api()
Expand Down Expand Up @@ -2146,8 +2147,8 @@ def render(self, mode: ActionRenderMode = ActionRenderMode.DEFAULT):
config["swap"] = self.swap
elif not self.should_add_swapfile():
config["swap"] = {"size": 0}
if self.grub is not None:
config["grub"] = self.grub
# if self.grub is not None:
# config["grub"] = self.grub
return config

def load_probe_data(self, probe_data):
Expand Down Expand Up @@ -2398,11 +2399,16 @@ def needs_bootloader_partition(self):
elif self.bootloader == Bootloader.BIOS:
return self._one(type="disk", grub_device=True) is None
elif self.bootloader == Bootloader.UEFI:
for esp in self._all(type="partition", grub_device=True):
if esp.fs() and esp.fs().mount():
if esp.fs().mount().path == "/boot/efi":
return False
return True
return False
# if len(self._all(type="disk")) > 0 and len(self._all(type="disk")) == len(
# self._all(type="disk", grub_device=False)
# ):
# return False
# for esp in self._all(type="partition", grub_device=True):
# if esp.fs() and esp.fs().mount():
# if esp.fs().mount().path == "/boot/efi":
# return False
# return True
elif self.bootloader == Bootloader.PREP:
return self._one(type="partition", grub_device=True) is None
else:
Expand Down
12 changes: 6 additions & 6 deletions subiquity/models/subiquity.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -457,12 +457,12 @@ def _machine_id(self):

def render(self):
config = {
"grub": {
"terminal": "unmodified",
"probe_additional_os": True,
"reorder_uefi": False,
"remove_old_uefi_loaders": False,
},
# "grub": {
# "terminal": "unmodified",
# "probe_additional_os": True,
# "reorder_uefi": False,
# "remove_old_uefi_loaders": False,
# },
"install": {
"unmount": "disabled",
"save_install_config": False,
Expand Down