diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2008-06-26 13:15:49 +1000 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2008-06-26 13:15:49 +1000 |
| commit | bbc9b77d8143d946da9accb985ef7af34c93c2d8 (patch) | |
| tree | d6a5def7346ada3bfe8983addc7dcff1b52b3f14 | |
| parent | 7ba8504aac82074cd95e6a24c834c79a49b54471 (diff) | |
| parent | fbcd98177357201a70a6fddb48666734edfe1874 (diff) | |
Merge branch 'quilt/kernel-doc'
| -rw-r--r-- | Documentation/00-INDEX | 2 | ||||
| -rw-r--r-- | Documentation/early-userspace/00-INDEX | 8 | ||||
| -rw-r--r-- | Documentation/early-userspace/initrd.txt (renamed from Documentation/initrd.txt) | 6 |
3 files changed, 11 insertions, 5 deletions
diff --git a/Documentation/00-INDEX b/Documentation/00-INDEX index 1977fab38656..acba8305fafd 100644 --- a/Documentation/00-INDEX +++ b/Documentation/00-INDEX @@ -179,8 +179,6 @@ ia64/ - directory with info about Linux on Intel 64 bit architecture. infiniband/ - directory with documents concerning Linux InfiniBand support. -initrd.txt - - how to use the RAM disk as an initial/temporary root filesystem. input/ - info on Linux input device support. io_ordering.txt diff --git a/Documentation/early-userspace/00-INDEX b/Documentation/early-userspace/00-INDEX new file mode 100644 index 000000000000..9deb666c4fce --- /dev/null +++ b/Documentation/early-userspace/00-INDEX @@ -0,0 +1,8 @@ +00-INDEX + - this file +README + - explains what early userspace is +buffer_format.txt + - documents the initramfs buffer format +initrd.txt + - how to use the RAM disk as an initial/temporary root filesystem. diff --git a/Documentation/initrd.txt b/Documentation/early-userspace/initrd.txt index 1ba84f3584e3..772d6a307345 100644 --- a/Documentation/initrd.txt +++ b/Documentation/early-userspace/initrd.txt @@ -111,7 +111,7 @@ procedure should create the /initrd directory. If initrd will not be mounted in some cases, its content is still accessible if the following device has been created: -# mknod /dev/initrd b 1 250 +# mknod /dev/initrd b 1 250 # chmod 400 /dev/initrd Second, the kernel has to be compiled with RAM disk support and with @@ -303,7 +303,7 @@ Last not least, CD-ROM distributors may use it for better installation from CD, e.g. by using a boot floppy and bootstrapping a bigger RAM disk via initrd from CD; or by booting via a loader like LOADLIN or directly from the CD-ROM, and loading the RAM disk from CD without need of -floppies. +floppies. Obsolete root change mechanism @@ -322,7 +322,7 @@ such a directory exists on the new root file system. In order to use this mechanism, you do not have to specify the boot command options root, init, or rw. (If specified, they will affect the real root file system, not the initrd environment.) - + If /proc is mounted, the "real" root device can be changed from within linuxrc by writing the number of the new root FS device to the special file /proc/sys/kernel/real-root-dev, e.g. |