compose: Include base dracut args in commitmeta #1997
Conversation
|
Split out prep patches in #1998. |
|
Another approach I didn't mention in the commit message was reading the initramfs args from |
jlebon
force-pushed
the
pr/dracut-override-replace
branch
from
15101e5
to
1115cf4
Compare
jlebon
force-pushed
the
pr/dracut-override-replace
branch
2 times, most recently
from
b248d17
to
1725509
Compare
|
OK, this one's ready to go! |
Keep the base initramfs arguments used in the commit metadata. The reasoning for this is that when regenerating the initramfs locally with `rpm-ostree initramfs --enable`, we want to match how it was built in the treecompose. This is important because the rest of the treecompose assumes that e.g. certain dracut modules are included or omitted. Right now, the way we achieve this is with using `dracut --rebuild`. However, we no longer have access to the base initramfs when replacing the kernel. Another issue with `--rebuild` is that when we *do* use it, dracut just dumbly appends the arguments to the base args. So we then end up with e.g. two `--kver` args, two `--add ostree`, two `--tmpdir`, etc... Another way to look at at this patch is that it unifies client-side and server-side paths when generating the initramfs. The only difference then is that we use the local `/etc` in the case of `rpm-ostree initramfs --enable`.
jlebon
force-pushed
the
pr/dracut-override-replace
branch
from
1725509
to
f26cf42
Compare
This is the second half of the previous commit. We check if the canonical dracut args are available in the commit metadata, and prefer those over using `--rebuild`. The latter is delegated as a backcompat fallback.
|
/lgtm |
jlebon
force-pushed
the
pr/dracut-override-replace
branch
from
f26cf42
to
270f585
Compare
|
Sorry, I thought I had pushed the |
|
/lgtm |
|
[APPROVALNOTIFIER] This PR is APPROVED This pull-request has been approved by: cgwalters, jlebon The full list of commands accepted by this bot can be found here. The pull request process is described here
Needs approval from an approver in each of these files:
Approvers can indicate their approval by writing |
|
Yup, CI is going to fail here. Will wait until #1999 is in then restart it. |
Keep the base initramfs arguments used in the commit metadata. The
reasoning for this is that when regenerating the initramfs locally with
rpm-ostree initramfs --enable, we want to match how it was built inthe treecompose. This is important because the rest of the treecompose
assumes that e.g. certain dracut modules are included or omitted.
Right now, the way we achieve this is with using
dracut --rebuild.However, we no longer have access to the base initramfs when replacing
the kernel. Another issue with
--rebuildis that when we do use it,dracut just dumbly appends the arguments to the base args. So we then
end up with e.g. two
--kverargs, two--add ostree, two--tmpdir,etc...
Another way to look at at this patch is that it unifies client-side and
server-side paths when generating the initramfs. The only difference
then is that we use the local
/etcin the case ofrpm-ostree initramfs --enable.