diff options
| author | Dave Reisner <dreisner@archlinux.org> | 2011-12-31 22:45:09 +0100 |
|---|---|---|
| committer | Dave Reisner <dreisner@archlinux.org> | 2012-01-05 01:08:46 +0100 |
| commit | 3602a8e80cc1866f2d4215a95d5627163654b2dc (patch) | |
| tree | 589d29dfcba69ee7b3311487818694c36d6379af | |
| parent | f8d1749dd9a63befc9fd46198c76a63a2f4b349e (diff) | |
| download | mkinitcpio-3602a8e80cc1866f2d4215a95d5627163654b2dc.tar.gz mkinitcpio-3602a8e80cc1866f2d4215a95d5627163654b2dc.tar.xz | |
mkinitcpio: remove hardcoded paths
Signed-off-by: Dave Reisner <dreisner@archlinux.org>
| -rw-r--r-- | install/autodetect | 4 | ||||
| -rwxr-xr-x | 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/\<raid[456]\>/raid456/g' | sort -u >>"$MODULE_FILE" fi @@ -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." |