CA-405404: Fix path to dracut

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). Signed-off-by: Alex Brett <[email protected]>
alexbrett · Jan 24, 2025 · 37d9237 · 37d9237
1 parent a4141f5
commit 37d9237
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/ocaml/networkd/lib/network_utils.ml b/ocaml/networkd/lib/network_utils.ml
@@ -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"
 

diff --git a/ocaml/xapi/xapi_globs.ml b/ocaml/xapi/xapi_globs.ml
@@ -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"