From: Harald Hoyer Date: Tue, 25 Jan 2011 10:34:25 +0000 (+0100) Subject: dracut.kernel.7.xml: s/rd_ZNET/rd.znet X-Git-Tag: 008~12 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=a2b5bb004da76fd658502a608f6132a4be7f62f4;p=thirdparty%2Fdracut.git dracut.kernel.7.xml: s/rd_ZNET/rd.znet --- diff --git a/dracut.kernel.7.xml b/dracut.kernel.7.xml index bf517ead8..1dcc8bfe1 100644 --- a/dracut.kernel.7.xml +++ b/dracut.kernel.7.xml @@ -323,15 +323,15 @@ This parameter can be specified multiple times. rd.luks.key= - <keypath>:<keydev>:<luksdev> + <keypath>:<keydev>:<luksdev> - keypath is a path to key file to look for. It's REQUIRED. - keydev is a device on which key file resides. It might be kernel name of devices (should start with "/dev/"), UUID (prefixed with "UUID=") or label (prefix with "LABEL="). You don't have to specify full UUID. Just its beginning will suffice, even if its ambiguous. All matching devices will be probed. This parameter is recommended, but not required. If not present, all block devices will be probed, which may significantly increase boot time. - If luksdev is given, the specified key will only be applied for that LUKS device. Possible values are the same as for keydev. Unless you have several LUKS devices, you don't have to specify this parameter. - The simplest usage is: - rd.luks.key=/foo/bar.key - As you see, you can skip colons in such case. + keypath is a path to key file to look for. It's REQUIRED. + keydev is a device on which key file resides. It might be kernel name of devices (should start with "/dev/"), UUID (prefixed with "UUID=") or label (prefix with "LABEL="). You don't have to specify full UUID. Just its beginning will suffice, even if its ambiguous. All matching devices will be probed. This parameter is recommended, but not required. If not present, all block devices will be probed, which may significantly increase boot time. + If luksdev is given, the specified key will only be applied for that LUKS device. Possible values are the same as for keydev. Unless you have several LUKS devices, you don't have to specify this parameter. + The simplest usage is: + rd.luks.key=/foo/bar.key + As you see, you can skip colons in such case. @@ -666,11 +666,11 @@ This parameter can be specified multiple times. ZNET - rd_ZNET=<nettype>,<subchannels>,<options> + rd.znet=<nettype>,<subchannels>,<options> - rd_ZNET can be specified multiple times on the kernel command line. e.g.: - rd_ZNET=qeth,0.0.0600,0.0.0601,0.0.0602,layer2=1,portname=foo -rd_ZNET=ctc,0.0.0600,0.0.0601,0.0.0602,protocol=bar + rd.znet can be specified multiple times on the kernel command line. e.g.: + rd.znet=qeth,0.0.0600,0.0.0601,0.0.0602,layer2=1,portname=foo +rd.znet=ctc,0.0.0600,0.0.0601,0.0.0602,protocol=bar @@ -898,14 +898,6 @@ rd_ZNET=ctc,0.0.0600,0.0.0601,0.0.0602,protocol=bar rd.luks.uuid - - - rd_LUKS_UUID - - - rd.luks.uuid - - rd_NO_LVMCONF @@ -1058,6 +1050,14 @@ rd_ZNET=ctc,0.0.0600,0.0.0601,0.0.0602,protocol=bar rd.zfcp + + + rd_ZNET + + + rd.znet + + KEYMAP