Commit a26d79ca authored Nov 25, 2006 by Thomas Chou Committed by Linus Torvalds Nov 25, 2006

[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 gen_initramfs_list.sh script, which it
obviously can't open.

Second, gen_initramfs_list.sh -l outputs multiple definitions for
deps_initramfs -- one for each argument.

Signed-off-by: Thomas Chou <thomas@wytron.com.tw>
Cc: Sam Ravnborg <sam@ravnborg.org>
Acked-by: Matthew Wilcox <matthew@wil.cx>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

parent 8e4d9dcb

scripts/gen_initramfs_list.sh

+2 −1

Original line number	Diff line number	Diff line
		@@ -158,7 +158,7 @@ unknown_option() {
		}

		list_header() {
		echo "deps_initramfs := \\"
		:
		}

		header() {
		@@ -227,6 +227,7 @@ arg="$1"
		case "$arg" in
		"-l") # files included in initramfs - used by kbuild
		dep_list="list_"
		echo "deps_initramfs := \\"
		shift
		;;
		"-o") # generate gzipped cpio image named $1

usr/Makefile

+1 −1

Original line number	Diff line number	Diff line
		@@ -20,7 +20,7 @@ $(obj)/initramfs_data.o: $(obj)/initramfs_data.cpio.gz FORCE
		hostprogs-y := gen_init_cpio
		initramfs := $(CONFIG_SHELL) $(srctree)/scripts/gen_initramfs_list.sh
		ramfs-input := $(if $(filter-out "",$(CONFIG_INITRAMFS_SOURCE)), \
		$(CONFIG_INITRAMFS_SOURCE),-d)
		$(shell echo $(CONFIG_INITRAMFS_SOURCE)),-d)
		ramfs-args := \
		$(if $(CONFIG_INITRAMFS_ROOT_UID), -u $(CONFIG_INITRAMFS_ROOT_UID)) \
		$(if $(CONFIG_INITRAMFS_ROOT_GID), -g $(CONFIG_INITRAMFS_ROOT_GID))

Admin message