Skip to content

xenopsd: fix config to match install location (#5444) #5447

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
merged 1 commit into from
Mar 4, 2024
Merged

xenopsd: fix config to match install location (#5444) #5447

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
12 changes: 6 additions & 6 deletions ocaml/xenopsd/scripts/make-custom-xenopsd.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,12 +37,12 @@ supported-vbd-backend-kinds=vbd,qdisk,9pfs
xenguest=${LIBEXECDIR}/xenguest

network-conf=${ETCDIR}/xapi/network.conf
vif-script=${LIBEXECDIR}/vif
vif-xl-script=${LIBEXECDIR}/vif
vbd-script=${LIBEXECDIR}/block
vbd-xl-script=${LIBEXECDIR}/block
qemu-vif-script=${LIBEXECDIR}/qemu-vif-script
setup-vif-rules=${LIBEXECDIR}/setup-vif-rules
vif-script=${XENOPSD_LIBEXECDIR}/vif
Copy link
Member

Choose a reason for hiding this comment

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

I would rather stop using the custom XENOPSD_LIBEXECDIR and use the standard LIBEXEC

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Could do that. Maybe @robhoes could give some insight on why that was done initially?

Copy link
Contributor Author

@ydirson ydirson Feb 9, 2024 •
edited
Loading

Choose a reason for hiding this comment

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

Also note, there is a /usr/libexec/xapi/ hardcoded install location in the Makefile too, with that path reflected in caml code and conf files. Might warrant a separate PR too.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Maybe we first fix the discrepancy, and then go for a separate PR to switch to LIBEXEC?

vif-xl-script=${XENOPSD_LIBEXECDIR}/vif
vbd-script=${XENOPSD_LIBEXECDIR}/block
vbd-xl-script=${XENOPSD_LIBEXECDIR}/block
qemu-vif-script=${XENOPSD_LIBEXECDIR}/qemu-vif-script
setup-vif-rules=${XENOPSD_LIBEXECDIR}/setup-vif-rules
sockets-group=$group
qemu-wrapper=${QEMU_WRAPPER_DIR}/qemu-wrapper
swtpm-wrapper=${QEMU_WRAPPER_DIR}/qemu-wrapper
Expand Down