Skip to content
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.

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

Few improvements to source installer #3249

Open
wants to merge 4 commits into
base: main
Choose a base branch
from
Open
Changes from 1 commit
Commits
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
35 changes: 35 additions & 0 deletions lisa/transformers/kernel_source_installer.py
Original file line number Diff line number Diff line change
Expand Up @@ -155,6 +155,27 @@ def install(self) -> str:

self._install_build_tools(node, runbook.build_deps)

# Ubuntu sort kernels by version. If installed kernel version is lower than default
# one extra steps needed to ensure boot into correct kernel.
if isinstance(node.os, Ubuntu):
result = node.execute(
"cat > /tmp/grub-lisa.cfg <<EOF\n" \
"GRUB_DEFAULT=saved\n" \
"GRUB_DISABLE_SUBMENU=y\n" \
"EOF\n",
shell=True
)
result.assert_exit_code()
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Add error message to describe what happened.


result = node.execute(
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Can it be cat into the /etc/default/grub.d/99-lisa.cfg directly? So it doesn't need an extra command to copy.

f"cp /tmp/grub-lisa.cfg /etc/default/grub.d/99-lisa.cfg",
sudo=True,
)
result.assert_exit_code()

# grub.cfg will be regenerated later during make install, so
# no need to explicitly regenerate it now.

factory = subclasses.Factory[BaseLocation](BaseLocation)
source = factory.create_by_runbook(
runbook=runbook.location, node=node, parent_log=self._log
Expand Down Expand Up @@ -197,6 +218,20 @@ def install(self) -> str:
)
result.assert_exit_code()

if isinstance(node.os, Ubuntu):
result = node.execute("find /boot -name 'grub.cfg'", sudo=True)
result.assert_exit_code()

grub_config = result.stdout
result = node.execute(f"grep 'menuentry ' {grub_config}", sudo=True)
result.assert_exit_code()

for idx, menuentry in enumerate(result.stdout.splitlines()):
if kernel_version in menuentry:
node.execute(f"grub-set-default {idx}", sudo=True)
result.assert_exit_code()
break

return kernel_version

def _install_build(self, node: Node, code_path: PurePath) -> None:
Expand Down