
From: Thayne Harbaugh <tharbaugh@lnxi.com>

I didn't see any comments other than these by Jeff.  Here's a new patch
with the following modifications:

On Fri, 2004-11-12 at 15:42 -0500, Jeff Garzik wrote:
> Thayne Harbaugh wrote:
> > diff -ur linux-2.6.10-rc1.orig/drivers/block/Kconfig linux-2.6.10-rc1/drivers/block/Kconfig
> > --- linux-2.6.10-rc1.orig/drivers/block/Kconfig	2004-11-12 11:03:52.657108248 -0700
> > +++ linux-2.6.10-rc1/drivers/block/Kconfig	2004-11-12 11:07:28.458301480 -0700
> > @@ -363,10 +363,14 @@
> >  	    file <name> <location> <mode> <uid> <gid>
> >  	    dir <name> <mode> <uid> <gid>
> >  	    nod <name> <mode> <uid> <gid> <dev_type> <maj> <min>
> > +	    slink <name> <target> <mode> <uid> <gid>
> > +	    pipe <name> <mode> <uid> <gid>
> > +	    sock <name> <mode> <uid> <gid>
> >  
> >  	  Where:
> > -	    <name>      name of the file/dir/nod in the archive
> > +	    <name>      name of the file/dir/nod/etc in the archive
> >  	    <location>  location of the file in the current filesystem
> > +	    <target>    link target
> >  	    <mode>      mode/permissions of the file
> >  	    <uid>       user id (0=root)
> >  	    <gid>       group id (0=root)
> 
> This info should get moved out of Kconfig, and into a Documentation/* 
> text file somewhere.

Now Kconfig and Documentation/early-userspace/README reference the usage
output of usr/gen_init_cpio instead of reproducing the file format
information.  This way there is no redundant information that gets out
of synch.  The drawback is that usr/gen_init_cpio has to be built before
it can be run to obtain the usage information.

> > +/*
> > + * Original work by Jeff Garzick
> 
> Please spell my last name correctly :)

Jeff refused to change his name to my new spelling so I have reluctantly
altered the comment so that it reads "Original work by Jeff
Garzik" (sic.). :)

Signed-off-by: Andrew Morton <akpm@osdl.org>
---

 25-akpm/drivers/block/Kconfig |   25 +++----------------------
 1 files changed, 3 insertions(+), 22 deletions(-)

diff -puN drivers/block/Kconfig~gen_init_cpio-slink_pipe_sock_2 drivers/block/Kconfig
--- 25/drivers/block/Kconfig~gen_init_cpio-slink_pipe_sock_2	2004-12-03 20:55:54.600581024 -0800
+++ 25-akpm/drivers/block/Kconfig	2004-12-03 20:55:54.604580416 -0800
@@ -363,28 +363,9 @@ config INITRAMFS_SOURCE
 	default ""
 	help
 	  This can be set to either a directory containing files, etc to be
-	  included in the initramfs archive, or a file containing newline
-	  separated entries.
-
-	  If it is a file, it should be in the following format:
-	    # a comment
-	    file <name> <location> <mode> <uid> <gid>
-	    dir <name> <mode> <uid> <gid>
-	    nod <name> <mode> <uid> <gid> <dev_type> <maj> <min>
-	    slink <name> <target> <mode> <uid> <gid>
-	    pipe <name> <mode> <uid> <gid>
-	    sock <name> <mode> <uid> <gid>
-
-	  Where:
-	    <name>      name of the file/dir/nod/etc in the archive
-	    <location>  location of the file in the current filesystem
-	    <target>    link target
-	    <mode>      mode/permissions of the file
-	    <uid>       user id (0=root)
-	    <gid>       group id (0=root)
-	    <dev_type>  device type (b=block, c=character)
-	    <maj>       major number of nod
-	    <min>       minor number of nod
+	  included in the initramfs archive, or a file containing  entries
+	  according to the format described by the "usr/gen_init_cpio"
+	  program in the kernel tree.
 
 	  If you are not sure, leave it blank.
 
_
