From 3602a8e80cc1866f2d4215a95d5627163654b2dc Mon Sep 17 00:00:00 2001 From: Dave Reisner Date: Sat, 31 Dec 2011 16:45:09 -0500 Subject: mkinitcpio: remove hardcoded paths Signed-off-by: Dave Reisner --- install/autodetect | 4 ++-- mkinitcpio | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/install/autodetect b/install/autodetect index 5537f7c..c787fcb 100644 --- a/install/autodetect +++ b/install/autodetect @@ -16,8 +16,8 @@ build() { fi if (( UID == 0 )) || in_array 'disk' $(groups); then - if [[ -x /sbin/mdadm ]]; then - /sbin/mdadm -Esv /dev/[hrsv]d* /dev/{ida,cciss,ataraid,mapper}/* | + if [[ -x $(type -P mdadm) ]]; then + mdadm -Esv /dev/[hrsv]d* /dev/{ida,cciss,ataraid,mapper}/* | sed -n 's/.*level=\([^ ]\+\) .*/\1/p' | sed 's/\/raid456/g' | sort -u >>"$MODULE_FILE" fi diff --git a/mkinitcpio b/mkinitcpio index b6581ed..bcf56e9 100755 --- a/mkinitcpio +++ b/mkinitcpio @@ -353,7 +353,7 @@ if (( ${#ADDED_MODULES[*]} )); then popd >/dev/null msg "Generating module dependencies" - /sbin/depmod -b "$BUILDROOT" "${KERNELVERSION}" + depmod -b "$BUILDROOT" "${KERNELVERSION}" rm "$BUILDROOT/lib/modules/$KERNELVERSION"/modules.!(dep.bin|alias.bin|symbols.bin) else warning "No modules were added to the image. This is probably not what you want." -- cgit v1.2.3-24-g4f1b