From b846f2a275e26b9dc8a931e95672eab61dba3205 Mon Sep 17 00:00:00 2001 From: Will Drewry Date: Wed, 3 Aug 2011 16:21:08 -0700 Subject: [PATCH] --- yaml --- r: 262306 b: refs/heads/master c: f2d34fd9435c7e60cb5189d036efe9abfc911862 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/Documentation/frv/booting.txt | 13 ++++++++++--- trunk/Documentation/kernel-parameters.txt | 1 + trunk/Documentation/m68k/kernel-options.txt | 14 ++++++++++++++ 4 files changed, 26 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index bc20b508ef14..309acec266ed 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 2af14162656b81bea9e03e76d7c5f1787cc86ea6 +refs/heads/master: f2d34fd9435c7e60cb5189d036efe9abfc911862 diff --git a/trunk/Documentation/frv/booting.txt b/trunk/Documentation/frv/booting.txt index ace200b7c214..37c4d84a0e57 100644 --- a/trunk/Documentation/frv/booting.txt +++ b/trunk/Documentation/frv/booting.txt @@ -106,13 +106,20 @@ separated by spaces: To use the first on-chip serial port at baud rate 115200, no parity, 8 bits, and no flow control. - (*) root=/dev/ + (*) root= - This specifies the device upon which the root filesystem resides. For - example: + This specifies the device upon which the root filesystem resides. It + may be specified by major and minor number, device path, or even + partition uuid, if supported. For example: /dev/nfs NFS root filesystem /dev/mtdblock3 Fourth RedBoot partition on the System Flash + PARTUUID=00112233-4455-6677-8899-AABBCCDDEEFF/PARTNROFF=1 + first partition after the partition with the given UUID + 253:0 Device with major 253 and minor 0 + + Authoritative information can be found in + "Documentation/kernel-parameters.txt". (*) rw diff --git a/trunk/Documentation/kernel-parameters.txt b/trunk/Documentation/kernel-parameters.txt index d57f00d1bb25..865e39f1850c 100644 --- a/trunk/Documentation/kernel-parameters.txt +++ b/trunk/Documentation/kernel-parameters.txt @@ -2245,6 +2245,7 @@ bytes respectively. Such letter suffixes can also be entirely omitted. ro [KNL] Mount root device read-only on boot root= [KNL] Root filesystem + See name_to_dev_t comment in init/do_mounts.c. rootdelay= [KNL] Delay (in seconds) to pause before attempting to mount the root filesystem diff --git a/trunk/Documentation/m68k/kernel-options.txt b/trunk/Documentation/m68k/kernel-options.txt index c93bed66e25d..97d45f276fe6 100644 --- a/trunk/Documentation/m68k/kernel-options.txt +++ b/trunk/Documentation/m68k/kernel-options.txt @@ -129,6 +129,20 @@ decimal 11 is the major of SCSI CD-ROMs, and the minor 0 stands for the first of these. You can find out all valid major numbers by looking into include/linux/major.h. +In addition to major and minor numbers, if the device containing your +root partition uses a partition table format with unique partition +identifiers, then you may use them. For instance, +"root=PARTUUID=00112233-4455-6677-8899-AABBCCDDEEFF". It is also +possible to reference another partition on the same device using a +known partition UUID as the starting point. For example, +if partition 5 of the device has the UUID of +00112233-4455-6677-8899-AABBCCDDEEFF then partition 3 may be found as +follows: + PARTUUID=00112233-4455-6677-8899-AABBCCDDEEFF/PARTNROFF=-2 + +Authoritative information can be found in +"Documentation/kernel-parameters.txt". + 2.2) ro, rw -----------