From ea13e7ab980debf80479926ccd1cf4225cfc02a7 Mon Sep 17 00:00:00 2001 From: Minfei Huang Date: Thu, 23 Jul 2015 18:29:26 +0800 Subject: [PATCH] dracut-module-setup: Enhance ISCSI to support ipv6 protocol Due to the different format between ipv4 and ipv6 protocol, quote the ipv6 address with bracket "[]" to make dracut notify. Signed-off-by: Minfei Huang Acked-by: Dave Young --- dracut-module-setup.sh | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/dracut-module-setup.sh b/dracut-module-setup.sh index 55261a1..c37f7c0 100755 --- a/dracut-module-setup.sh +++ b/dracut-module-setup.sh @@ -542,10 +542,12 @@ kdump_setup_iscsi_device() { kdump_setup_netdev $netdev $srcaddr # prepare netroot= command line - # FIXME: IPV6 addresses require explicit [] around $tgt_ipaddr # FIXME: Do we need to parse and set other parameters like protocol, port # iscsi_iface_name, netdev_name, LUN etc. + if is_ipv6_address $tgt_ipaddr; then + tgt_ipaddr="[$tgt_ipaddr]" + fi netroot_str="netroot=iscsi:${userpwd_str}${userpwd_in_str}@$tgt_ipaddr::::$tgt_name" [[ -f $netroot_conf ]] || touch $netroot_conf