From c3d068b9ff96b2897cec6a0874ff47e595b77de4 Mon Sep 17 00:00:00 2001
From: Dave Reisner <dreisner@archlinux.org>
Date: Mon, 24 Sep 2012 08:30:22 -0400
Subject: mkinitcpio: protect module install on $MODPATHS

This was always wrong and should have been braced by MODPATHS rather
than ADDED_MODULES. However, since ADDED_MODULES now possibly contains
modules that weren't actually added (builtins), creating an initramfs
without modules causes cp to be passed a null string to be copied.

Signed-off-by: Dave Reisner <dreisner@archlinux.org>
---
 mkinitcpio | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mkinitcpio b/mkinitcpio
index c80db8f..766405a 100755
--- a/mkinitcpio
+++ b/mkinitcpio
@@ -362,7 +362,7 @@ write_image_config
 trap -- RETURN
 trap '(( ++builderrors ))' ERR
 
-if (( ${#ADDED_MODULES[*]} )); then
+if (( ${#MODPATHS[*]} )); then
     printf '%s\0' "${MODPATHS[@]}" | sort -zu |
         xargs -0 cp -t "$BUILDROOT/usr/lib/modules/$KERNELVERSION/kernel"
 
-- 
cgit v1.2.3-24-g4f1b