Skip to content

CA-407115: Adding logic to handle boot entries without additional arguments #153

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

Merged
liulinC merged 1 commit into from
Mar 3, 2025
Merged

CA-407115: Adding logic to handle boot entries without additional arguments #153

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
21 changes: 11 additions & 10 deletions xcp/bootloader.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@
COUNTER = 0

class MenuEntry(object):
def __init__(self, hypervisor, hypervisor_args, kernel, kernel_args,

Check notice on line 46 in xcp/bootloader.py

View workflow job for this annotation

GitHub Actions / test (3.11, ubuntu-22.04) 

Refactor: Too many positional arguments (10/5)
initrd, title = None, tboot = None, tboot_args = None,
root = None):
self.extra = None
Expand Down Expand Up @@ -77,7 +77,7 @@
self.kernel_args = ' '.join(args)

class Bootloader(object):
def __init__(self, src_fmt, src_file, menu = None, menu_order = None,

Check notice on line 80 in xcp/bootloader.py

View workflow job for this annotation

GitHub Actions / test (3.11, ubuntu-22.04) 

Refactor: Too many positional arguments (10/5)
default = None, timeout = None, serial = None,
location = None, env_block = None):

Expand Down Expand Up @@ -345,6 +345,12 @@
COUNTER += 1
return "label%d" % COUNTER

def parse_boot_entry(line):
parts = line.split(None, 2) # Split into at most 3 parts
entry = parts[1] if len(parts) > 1 else ""
args = parts[2] if len(parts) > 2 else ""
return entry, args

Check notice on line 353 in xcp/bootloader.py

View workflow job for this annotation

GitHub Actions / test (3.11, ubuntu-22.04) 

Convention: Trailing whitespace
fh = open_textfile(src_file, "r")
try:
for line in fh:
Expand Down Expand Up @@ -395,23 +401,18 @@
elif title:
if l.startswith("multiboot2"):
if "tboot" in l:
tboot, tboot_args = (l.split(None, 1)
[1].split(None, 1))
tboot, tboot_args = parse_boot_entry(l)
else:
hypervisor, hypervisor_args = (l.split(None, 1)
[1].split(None, 1))
hypervisor, hypervisor_args = parse_boot_entry(l)
elif l.startswith("module2"):
if not hypervisor:
hypervisor, hypervisor_args = (l.split(None, 1)
[1].split(None, 1))
hypervisor, hypervisor_args = parse_boot_entry(l)
elif kernel:
initrd = l.split(None, 1)[1]
else:
kernel, kernel_args = (l.split(None, 1)
[1].split(None, 1))
kernel, kernel_args = parse_boot_entry(l)
elif l.startswith("linux"):
kernel, kernel_args = (l.split(None, 1)
[1].split(None, 1))
kernel, kernel_args = parse_boot_entry(l)
elif l.startswith("initrd"):
initrd = l.split(None, 1)[1]
elif l.startswith("search --label --set root"):
Expand Down
Loading