Support kexec reboot for grub2-bls and sdboot #126
Conversation
danyspin97
force-pushed
the
sdboot-reboot
branch
2 times, most recently
from
dc614ed
to
ff8b0ee
Compare
danyspin97
force-pushed
the
sdboot-reboot
branch
3 times, most recently
from
c74dad1
to
ed3116f
Compare
|
I can confirm that this PR works now. |
lib/BlsEntry.cpp
Outdated
| std::string kernel{}; | ||
| std::string initrd{}; |
There was a problem hiding this comment.
Initialization with braces is not needed here / doesn't make any difference...
lib/BlsEntry.cpp
Outdated
| std::string initrd{}; | ||
| while(getline(is, str)) | ||
| { | ||
| TransactionalUpdate::Util::trim(str); |
There was a problem hiding this comment.
We are in the TransactionalUpdate namespace already (same for the other occurrences in the patch).
lib/Reboot.cpp
Outdated
| kernel = efi / std::filesystem::path(kernel).relative_path(); | ||
| initrd = efi / std::filesystem::path(initrd).relative_path(); | ||
| } | ||
| command = "kexec --kexec-syscall-auto -l " + kernel + " --initrd=" + initrd + " --reuse-cmdline;"; |
There was a problem hiding this comment.
I assume that now, with the BLS, in theory the kernel / initrd entries could also contain things like spaces, e.g. a pathname such as My System/6.9.9-1-default/initrd? Or can we be sure that the subdirectory will always be without whitespace?
There was a problem hiding this comment.
that is correct, FAT32 can have spaces in the directory and file names. sdbootutil does not generate them tho
There was a problem hiding this comment.
Right, it is better to add quotes Just in case this might happen. Fixed.
There was a problem hiding this comment.
But now the user could add a ' to the file or directory name ;-) If we wanted to protect ourselves, then every occurrence of ' would have to be replaced with '\''.
Otherwise I'll just merge tomorrow.
danyspin97
force-pushed
the
sdboot-reboot
branch
2 times, most recently
from
8c157ff
to
20cb4ae
Compare
danyspin97
force-pushed
the
sdboot-reboot
branch
from
20cb4ae
to
019ac90
Compare
No description provided.