From bb4d2b72c1d35ab9d65d632be0dcaf00cfa7d600 Mon Sep 17 00:00:00 2001 From: Allan McRae Date: Mon, 16 Jul 2012 11:26:31 +1000 Subject: Do not use full path for ldconfig The ldconfig binary is not guaranteed to be in /sbin. Change to calling just "ldconfig" rather than using the full path. This removed the check that the ldconfig binary exists. However, it is a reasonable assumption that it will exist if its configuration file does. Signed-off-by: Allan McRae --- lib/libalpm/util.c | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) (limited to 'lib/libalpm') diff --git a/lib/libalpm/util.c b/lib/libalpm/util.c index be20ddee..fd1d7868 100644 --- a/lib/libalpm/util.c +++ b/lib/libalpm/util.c @@ -621,13 +621,10 @@ int _alpm_ldconfig(alpm_handle_t *handle) snprintf(line, PATH_MAX, "%setc/ld.so.conf", handle->root); if(access(line, F_OK) == 0) { - snprintf(line, PATH_MAX, "%ssbin/ldconfig", handle->root); - if(access(line, X_OK) == 0) { - char arg0[32]; - char *argv[] = { arg0, NULL }; - strcpy(arg0, "ldconfig"); - return _alpm_run_chroot(handle, "/sbin/ldconfig", argv); - } + char arg0[32]; + char *argv[] = { arg0, NULL }; + strcpy(arg0, "ldconfig"); + return _alpm_run_chroot(handle, "ldconfig", argv); } return 0; -- cgit v1.2.3-70-g09d2