Commit f2d34fd9435c7e60cb5189d036efe9abfc911862

Authored by Will Drewry
Committed by Linus Torvalds
1 parent 2af1416265

Documentation: add pointer to name_to_dev_t for root= values

Update kernel-parameters.txt to point users to the authoritative comment
for name_to_dev_t.  In addition, updates other places where some
name_to_dev_t behavior was discussed.  All other references to root=
appear to be for explicit sample usage or just side comments when
discussing other kernel parameters.

Signed-off-by: Will Drewry <wad@chromium.org>
Cc: Kay Sievers <kay.sievers@vrfy.org>
Cc: Randy Dunlap <rdunlap@xenotime.net>
Cc: Namhyung Kim <namhyung@gmail.com>
Cc: Trond Myklebust <Trond.Myklebust@netapp.com>
Cc: Jens Axboe <axboe@kernel.dk>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

Showing 3 changed files with 25 additions and 3 deletions Side-by-side Diff

Documentation/frv/booting.txt
... ... @@ -106,13 +106,20 @@
106 106 To use the first on-chip serial port at baud rate 115200, no parity, 8
107 107 bits, and no flow control.
108 108  
109   - (*) root=/dev/<xxxx>
  109 + (*) root=<xxxx>
110 110  
111   - This specifies the device upon which the root filesystem resides. For
112   - example:
  111 + This specifies the device upon which the root filesystem resides. It
  112 + may be specified by major and minor number, device path, or even
  113 + partition uuid, if supported. For example:
113 114  
114 115 /dev/nfs NFS root filesystem
115 116 /dev/mtdblock3 Fourth RedBoot partition on the System Flash
  117 + PARTUUID=00112233-4455-6677-8899-AABBCCDDEEFF/PARTNROFF=1
  118 + first partition after the partition with the given UUID
  119 + 253:0 Device with major 253 and minor 0
  120 +
  121 + Authoritative information can be found in
  122 + "Documentation/kernel-parameters.txt".
116 123  
117 124 (*) rw
118 125  
Documentation/kernel-parameters.txt
... ... @@ -2245,6 +2245,7 @@
2245 2245 ro [KNL] Mount root device read-only on boot
2246 2246  
2247 2247 root= [KNL] Root filesystem
  2248 + See name_to_dev_t comment in init/do_mounts.c.
2248 2249  
2249 2250 rootdelay= [KNL] Delay (in seconds) to pause before attempting to
2250 2251 mount the root filesystem
Documentation/m68k/kernel-options.txt
... ... @@ -129,6 +129,20 @@
129 129 the first of these. You can find out all valid major numbers by
130 130 looking into include/linux/major.h.
131 131  
  132 +In addition to major and minor numbers, if the device containing your
  133 +root partition uses a partition table format with unique partition
  134 +identifiers, then you may use them. For instance,
  135 +"root=PARTUUID=00112233-4455-6677-8899-AABBCCDDEEFF". It is also
  136 +possible to reference another partition on the same device using a
  137 +known partition UUID as the starting point. For example,
  138 +if partition 5 of the device has the UUID of
  139 +00112233-4455-6677-8899-AABBCCDDEEFF then partition 3 may be found as
  140 +follows:
  141 + PARTUUID=00112233-4455-6677-8899-AABBCCDDEEFF/PARTNROFF=-2
  142 +
  143 +Authoritative information can be found in
  144 +"Documentation/kernel-parameters.txt".
  145 +
132 146  
133 147 2.2) ro, rw
134 148 -----------