Skip to content

Commit

Permalink
CA-405404: Fix path to dracut (#6250)
Browse files Browse the repository at this point in the history
On all platforms tested the canonical location for dracut is
`/usr/bin/dracut`. Older platforms symlink to it from
`/usr/sbin/dracut`, whilst newer ones do not, thus on these platforms
xapi is unable to find dracut and fails to start.

Adjust the path to the canonical location to ensure it operates
correctly on all platforms.

Also adjust a reference in network_utils.ml (whilst newer platforms also
seem to have the symlink from `/sbin/dracut`, it would seem to make
sense to point to the canonical location regardless).
  • Loading branch information
robhoes authored Jan 27, 2025
2 parents a4141f5 + 37d9237 commit bc62e4c
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 2 deletions.
2 changes: 1 addition & 1 deletion ocaml/networkd/lib/network_utils.ml
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@ let bonding_dir = "/proc/net/bonding/"

let uname = ref "/usr/bin/uname"

let dracut = ref "/sbin/dracut"
let dracut = ref "/usr/bin/dracut"

let modinfo = ref "/sbin/modinfo"

Expand Down
2 changes: 1 addition & 1 deletion ocaml/xapi/xapi_globs.ml
Original file line number Diff line number Diff line change
Expand Up @@ -935,7 +935,7 @@ let depmod = ref "/usr/sbin/depmod"

let driver_tool = ref "/opt/xensource/debug/drivertool.sh"

let dracut = ref "/usr/sbin/dracut"
let dracut = ref "/usr/bin/dracut"

let udevadm = ref "/usr/sbin/udevadm"

Expand Down

0 comments on commit bc62e4c

Please sign in to comment.