diff options
author | Randy Dunlap <randy.dunlap@oracle.com> | 2007-10-17 02:29:29 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-10-17 11:42:56 -0400 |
commit | 1810732e94576ae0d04e953ecaba8c7151c9a287 (patch) | |
tree | c2ff43ec67ea41d2e5fee33b5e9a0d828871d3b5 /Documentation/initrd.txt | |
parent | 0e1ccb9619e8e9ae86dfc5a4645ccf3bf5a2eb3f (diff) |
docs: ramdisk/initrd/initramfs corrections
initrd/initramfs/ramdisk docs:
- fix typos/spellos/grammar
- clarify RAM disk config location
- correct cpio option
Acked-by: Bryan O'Sullivan <bos@serpentine.com>
Acked-by: Rob Landley <rob@landley.net>
Cc: Werner Almesberger <werner@almesberger.net>
Cc: H. Peter Anvin <hpa@zytor.com>
Signed-off-by: Randy Dunlap <randy.dunlap@oracle.com>
Acked-by: Jesper Juhl <jesper.juhl@gmail.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'Documentation/initrd.txt')
-rw-r--r-- | Documentation/initrd.txt | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/Documentation/initrd.txt b/Documentation/initrd.txt index d3dc505104da..74f68b35f7c1 100644 --- a/Documentation/initrd.txt +++ b/Documentation/initrd.txt | |||
@@ -80,8 +80,8 @@ Compressed cpio images | |||
80 | ---------------------- | 80 | ---------------------- |
81 | 81 | ||
82 | Recent kernels have support for populating a ramdisk from a compressed cpio | 82 | Recent kernels have support for populating a ramdisk from a compressed cpio |
83 | archive, on such systems, the creation of a ramdisk image doesn't need to | 83 | archive. On such systems, the creation of a ramdisk image doesn't need to |
84 | involve special block devices or loopbacks, you merely create a directory on | 84 | involve special block devices or loopbacks; you merely create a directory on |
85 | disk with the desired initrd content, cd to that directory, and run (as an | 85 | disk with the desired initrd content, cd to that directory, and run (as an |
86 | example): | 86 | example): |
87 | 87 | ||
@@ -293,7 +293,7 @@ information as small as possible. In this case, a common initrd could be | |||
293 | generated with all the necessary modules. Then, only /sbin/init or a file | 293 | generated with all the necessary modules. Then, only /sbin/init or a file |
294 | read by it would have to be different. | 294 | read by it would have to be different. |
295 | 295 | ||
296 | A third scenario are more convenient recovery disks, because information | 296 | A third scenario is more convenient recovery disks, because information |
297 | like the location of the root FS partition doesn't have to be provided at | 297 | like the location of the root FS partition doesn't have to be provided at |
298 | boot time, but the system loaded from initrd can invoke a user-friendly | 298 | boot time, but the system loaded from initrd can invoke a user-friendly |
299 | dialog and it can also perform some sanity checks (or even some form of | 299 | dialog and it can also perform some sanity checks (or even some form of |
@@ -339,8 +339,8 @@ the new, supported mechanism is called "pivot_root". | |||
339 | Mixed change_root and pivot_root mechanism | 339 | Mixed change_root and pivot_root mechanism |
340 | ------------------------------------------ | 340 | ------------------------------------------ |
341 | 341 | ||
342 | In case you did not want to use root=/dev/ram0 to trig the pivot_root mechanism, | 342 | In case you did not want to use root=/dev/ram0 to trigger the pivot_root |
343 | you may create both /linuxrc and /sbin/init in your initrd image. | 343 | mechanism, you may create both /linuxrc and /sbin/init in your initrd image. |
344 | 344 | ||
345 | /linuxrc would contain only the following: | 345 | /linuxrc would contain only the following: |
346 | 346 | ||
@@ -350,7 +350,7 @@ echo 0x0100 >/proc/sys/kernel/real-root-dev | |||
350 | umount -n /proc | 350 | umount -n /proc |
351 | 351 | ||
352 | Once linuxrc exited, the kernel would mount again your initrd as root, | 352 | Once linuxrc exited, the kernel would mount again your initrd as root, |
353 | this time executing /sbin/init. Again, it would be duty of this init | 353 | this time executing /sbin/init. Again, it would be the duty of this init |
354 | to build the right environment (maybe using the root= device passed on | 354 | to build the right environment (maybe using the root= device passed on |
355 | the cmdline) before the final execution of the real /sbin/init. | 355 | the cmdline) before the final execution of the real /sbin/init. |
356 | 356 | ||