path: root/usr
diff options
authorThomas Chou <>2006-11-25 19:09:18 (GMT)
committerLinus Torvalds <>2006-11-25 21:28:33 (GMT)
commita26d79ca81d6e46c445c8db87a89740c9b4d17e9 (patch)
tree1134141b627cbf3c469f7067054ee4680fe58b36 /usr
parent8e4d9dcb4205dd43c4297168022ed0c6874fb918 (diff)
[PATCH] initramfs: handle more than one source dir or file list
Fix bug 7401. Handle more than one source dir or file list to the initramfs gen scripts. The Kconfig help for INITRAMFS_SOURCE claims that you can specify multiple space-separated sources in order to allow unprivileged users to build an image. There are two bugs in the current implementation that prevent this from working. First, we pass "file1 dir2" to the script, which it obviously can't open. Second, -l outputs multiple definitions for deps_initramfs -- one for each argument. Signed-off-by: Thomas Chou <> Cc: Sam Ravnborg <> Acked-by: Matthew Wilcox <> Signed-off-by: Andrew Morton <> Signed-off-by: Linus Torvalds <>
Diffstat (limited to 'usr')
1 files changed, 1 insertions, 1 deletions
diff --git a/usr/Makefile b/usr/Makefile
index e338e7b..382702a 100644
--- a/usr/Makefile
+++ b/usr/Makefile
@@ -20,7 +20,7 @@ $(obj)/initramfs_data.o: $(obj)/initramfs_data.cpio.gz FORCE
hostprogs-y := gen_init_cpio
initramfs := $(CONFIG_SHELL) $(srctree)/scripts/
ramfs-input := $(if $(filter-out "",$(CONFIG_INITRAMFS_SOURCE)), \
+ $(shell echo $(CONFIG_INITRAMFS_SOURCE)),-d)
ramfs-args := \