From: Harald Hoyer Date: Tue, 25 Jan 2011 10:53:52 +0000 (+0100) Subject: iscsi: changed parameters to new rd.iscsi style X-Git-Tag: 008~11 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=b43f4df540b28976526476d439017dd7f5211d00;p=thirdparty%2Fdracut.git iscsi: changed parameters to new rd.iscsi style --- diff --git a/dracut.kernel.7.xml b/dracut.kernel.7.xml index 1dcc8bfe1..35cf2552a 100644 --- a/dracut.kernel.7.xml +++ b/dracut.kernel.7.xml @@ -139,8 +139,7 @@ This parameter can be specified multiple times. - rd.break= - {cmdline|pre-udev|pre-trigger|initqueue|pre-mount|mount|pre-pivot} + rd.break={cmdline|pre-udev|pre-trigger|initqueue|pre-mount|mount|pre-pivot} drop to a shell on defined breakpoint @@ -186,8 +185,7 @@ This parameter can be specified multiple times. - vconsole.keymap.ext= - <list of keymap base file names> + vconsole.keymap.ext=<list of keymap base file names> list of extra keymaps to bo loaded (sep. by space); will be written as EXT_KEYMAP to /etc/vconsole.conf in the initramfs @@ -195,8 +193,7 @@ This parameter can be specified multiple times. - vconsole.font.unicode= - <1|0> + vconsole.font.unicode=<1|0> boolean, indicating UTF-8 mode; will be written as UNICODE to /etc/vconsole.conf in the initramfs @@ -204,8 +201,7 @@ This parameter can be specified multiple times. - vconsole.font= - <font base file name> + vconsole.font=<font base file name> console font; taken from consolefonts directory; will be written as FONT to /etc/vconsole.conf in the initramfs; e.g.: vconsole.font=LatArCyrHeb-16 @@ -213,8 +209,7 @@ This parameter can be specified multiple times. - vconsole.font.map= - <console map base file name> + vconsole.font.map=<console map base file name> see description of '-m' parameter in setfont manual; taken from consoletrans directory; will be written as FONT_MAP to /etc/vconsole.conf in the initramfs @@ -222,8 +217,7 @@ This parameter can be specified multiple times. - vconsole.font.unimap= - <unicode table base file name> + vconsole.font.unimap=<unicode table base file name> see description of '-u' parameter in setfont manual; taken from unimaps directory; will be written as FONT_UNIMAP to /etc/vconsole.conf in the initramfs @@ -231,8 +225,7 @@ This parameter can be specified multiple times. - locale.LANG= - <locale> + locale.LANG=<locale> taken from the environment; if no UNICODE is defined we set its value in basis of LANG value (whether it ends with ".utf8" (or similar) or not); will be written as LANG to /etc/locale.conf in the initramfs; e.g.: locale.LANG=pl_PL.utf8 @@ -240,8 +233,7 @@ This parameter can be specified multiple times. - locale.LC_ALL= - <locale> + locale.LC_ALL=<locale> taken from the environment; will be written as LC_ALL to /etc/locale.conf in the initramfs @@ -278,7 +270,7 @@ This parameter can be specified multiple times. - rd.lvm.conf + rd.lvm.conf=0 remove any /etc/lvm/lvm.conf, which may exist in the initramfs @@ -309,7 +301,7 @@ This parameter can be specified multiple times. - rd.luks.crypttab + rd.luks.crypttab=0 do not check, if LUKS partition is in /etc/crypttab @@ -322,8 +314,7 @@ This parameter can be specified multiple times. - rd.luks.key= - <keypath>:<keydev>:<luksdev> + rd.luks.key=<keypath>:<keydev>:<luksdev> keypath is a path to key file to look for. It's REQUIRED. @@ -353,7 +344,7 @@ This parameter can be specified multiple times. - rd.md.conf + rd.md.conf=0 ignore mdadm.conf included in initramfs @@ -395,8 +386,7 @@ This parameter can be specified multiple times. - ip= - {dhcp|on|any|dhcp6|auto6} + ip={dhcp|on|any|dhcp6|auto6} dhcp|on|any: get ip from dhcp server from all interfaces. If root=dhcp, @@ -434,8 +424,7 @@ This parameter can be specified multiple times. - bootdev= - <interface> + bootdev=<interface> specify network interface to use routing and netroot information from. @@ -444,9 +433,7 @@ Required if multiple ip= lines are used. - nameserver= - <IP> - nameserver=<IP> ... + nameserver=<IP>nameserver=<IP> ... specify nameserver(s) to use @@ -459,10 +446,7 @@ Required if multiple ip= lines are used. - root= - <server-ip>: - <root-dir> - :<nfs-options> + root=<server-ip>:<root-dir>:<nfs-options> mount nfs share from <server-ip>:/<root-dir>, if no server-ip is given, @@ -474,8 +458,7 @@ NFS options can be appended with the prefix ":" or "," and a root=nfs:<server-ip>:<root-dir>:<nfs-options> root=nfs4:<server-ip>:<root-dir>:<nfs-options> - root= - {dhcp|dhcp6} + root={dhcp|dhcp6} root=dhcp alone directs initrd to look at the DHCP root-path where NFS @@ -487,12 +470,8 @@ options can be specified. - root= - /dev/nfs - nfsroot= - <server-ip>: - <root-dir> - :<nfs-options> + root=/dev/nfs + nfsroot=<server-ip>:<root-dir>:<nfs-options> Deprecated! kernel Documentation/filesystems/nfsroot.txt defines @@ -561,22 +540,24 @@ netroot=iscsi:192.168.50.1::::iqn.2009-06.dracut:target1 root=??? - iscsi_initiator=<initiator> - iscsi_target_name=<target_name> - iscsi_target_ip=<target ip> - iscsi_target_port=<target port> - iscsi_target_group=<target group> - iscsi_username=<username> - iscsi_password=<password> - iscsi_in_username=<in username> - iscsi_in_password=<in password> + rd.iscsi.initiator=<initiator> + rd.iscsi.target.name=<target name> + rd.iscsi.target.ip=<target ip> + rd.iscsi.target.port=<target port> + rd.iscsi.target.group=<target group> + rd.iscsi.username=<username> + rd.iscsi.password=<password> + rd.iscsi.in.username=<in username> + rd.iscsi.in.password=<in password> manually specify all iscsistart parameter (see iscsistart --help) - root=??? iscsi_firmware + + root=??? rd.iscsi.firmware=1 + will read the iscsi parameter from the BIOS firmware @@ -629,11 +610,7 @@ as the rootfs. - rd.dasd= - <dasd_adaptor device bus ID> - ,readonly=X - ,use_diag=X - ,erplog=X + rd.dasd=<dasd_adaptor device bus ID>,readonly=X,use_diag=X,erplog=X activate DASD device with the given adaptor device bus ID and setting the sysfs attributes @@ -986,6 +963,86 @@ rd.znet=ctc,0.0.0600,0.0.0601,0.0.0602,protocol=bar rd.nfs.domain + + + iscsi_initiator + + + rd.iscsi.initiator + + + + + iscsi_target_name + + + rd.iscsi.target.name + + + + + iscsi_target_ip + + + rd.iscsi.target.ip + + + + + iscsi_target_port + + + rd.iscsi.target.port + + + + + iscsi_target_group + + + rd.iscsi.target.group + + + + + iscsi_username + + + rd.iscsi.username + + + + + iscsi_password + + + rd.iscsi.password + + + + + iscsi_in_username + + + rd.iscsi.in.username + + + + + iscsi_in_password + + + rd.iscsi.in.password + + + + + iscsi_firmware + + + rd.iscsi.firmware=0 + + rd_NO_PLYMOUTH diff --git a/modules.d/95iscsi/iscsiroot b/modules.d/95iscsi/iscsiroot index ebad9c8d0..bf82c8f11 100755 --- a/modules.d/95iscsi/iscsiroot +++ b/modules.d/95iscsi/iscsiroot @@ -40,7 +40,7 @@ modprobe crc32c 2>/dev/null [ -e /tmp/root.info ] && . /tmp/root.info -if getarg iscsi_firmware ; then +if getargbool 0 rd.iscsi.firmware -y iscsi_firmware ; then if [ -n "${root%%block:*}" ]; then # if root is not specified try to mount the whole iSCSI LUN printf 'ENV{DEVTYPE}!="partition", SYMLINK=="disk/by-path/*-iscsi-*-*", SYMLINK+="root"\n' >> /etc/udev/rules.d/99-iscsi-root.rules @@ -50,23 +50,23 @@ if getarg iscsi_firmware ; then fi # override conf settings by command line options -arg=$(getarg iscsi_initiator) +arg=$(getargs rd.iscsi.initiator iscsi_initiator=) [ -n "$arg" ] && iscsi_initiator=$arg -arg=$(getarg iscsi_target_name) +arg=$(getargs rd.iscsi.target.name iscsi_target_name=) [ -n "$arg" ] && iscsi_target_name=$arg -arg=$(getarg iscsi_target_ip) +arg=$(getargs rd.iscsi.target.ip iscsi_target_ip) [ -n "$arg" ] && iscsi_target_ip=$arg -arg=$(getarg iscsi_target_port) +arg=$(getargs rd.iscsi.target.port iscsi_target_port=) [ -n "$arg" ] && iscsi_target_port=$arg -arg=$(getarg iscsi_target_group) +arg=$(getargs rd.iscsi.target.group iscsi_target_group=) [ -n "$arg" ] && iscsi_target_group=$arg -arg=$(getarg iscsi_username) +arg=$(getargs rd.iscsi.username iscsi_username=) [ -n "$arg" ] && iscsi_username=$arg -arg=$(getarg iscsi_password) +arg=$(getargs rd.iscsi.password iscsi_password) [ -n "$arg" ] && iscsi_password=$arg -arg=$(getarg iscsi_in_username) +arg=$(getargs rd.iscsi.in.username iscsi_in_username=) [ -n "$arg" ] && iscsi_in_username=$arg -arg=$(getarg iscsi_in_password) +arg=$(getargs rd.iscsi.in.password iscsi_in_password=) [ -n "$arg" ] && iscsi_in_password=$arg handle_netroot() diff --git a/modules.d/95iscsi/parse-iscsiroot.sh b/modules.d/95iscsi/parse-iscsiroot.sh index 644fee2c2..bc82050ad 100755 --- a/modules.d/95iscsi/parse-iscsiroot.sh +++ b/modules.d/95iscsi/parse-iscsiroot.sh @@ -20,7 +20,7 @@ [ -z "$root" ] && root=$(getarg root=) [ -z "$netroot" ] && netroot=$(getarg netroot=) [ -z "$iscsiroot" ] && iscsiroot=$(getarg iscsiroot=) -[ -z "$iscsi_firmware" ] && getarg iscsi_firmware && iscsi_firmware="1" +[ -z "$iscsi_firmware" ] && getargbool 0 rd.iscsi.firmware -y iscsi_firmware && iscsi_firmware="1" [ -n "$iscsiroot" ] && [ -n "$iscsi_firmware" ] && die "Mixing iscsiroot and iscsi_firmware is dangerous"