Skip to content

Commit 37d9237

Browse files
committed
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]>
1 parent a4141f5 commit 37d9237

File tree

2 files changed

+2
-2
lines changed

2 files changed

+2
-2
lines changed

ocaml/networkd/lib/network_utils.ml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ let bonding_dir = "/proc/net/bonding/"
6363

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

66-
let dracut = ref "/sbin/dracut"
66+
let dracut = ref "/usr/bin/dracut"
6767

6868
let modinfo = ref "/sbin/modinfo"
6969

ocaml/xapi/xapi_globs.ml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -935,7 +935,7 @@ let depmod = ref "/usr/sbin/depmod"
935935

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

938-
let dracut = ref "/usr/sbin/dracut"
938+
let dracut = ref "/usr/bin/dracut"
939939

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

0 commit comments

Comments
 (0)