[PATCH v3 9/9] module-setup: remove software iscsi cmdline generated by dracut

[Xunlei Pang]

After adding "--hostonly-cmdline", besides 99kdump, 95iscsi
also generates iscsi related cmdline. IOW, we have duplicate
software iscsi cmdlines.

95iscsi generated software iscsi cmdline doesn't work, so we
remove that of 95iscsi and use that of 99kdump which has been
well tested.

We can change to use 95iscsi when possible in the future.

Signed-off-by: Xunlei Pang <xlpang(a)redhat.com&gt;
---
 dracut-module-setup.sh | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/dracut-module-setup.sh b/dracut-module-setup.sh
index ae13337..b8a7038 100755
--- a/dracut-module-setup.sh
+++ b/dracut-module-setup.sh
@@ -555,6 +555,10 @@ kdump_setup_iscsi_device() {
         return
     fi
 
+    # Remove software iscsi cmdline generated by 99iscsi,
+    # and let kdump regenerate here.
+    rm -f ${initdir}/etc/cmdline.d/95iscsi.conf
+
     tgt_name=$(kdump_iscsi_get_rec_val ${path} "node.name")
     tgt_ipaddr=$(kdump_iscsi_get_rec_val ${path} "node.conn\[0\].address")
 
-- 
1.8.3.1

[Dave Young]

Hi Xunlei,
On 09/06/17 at 02:44pm, Xunlei Pang wrote:
>  After adding "--hostonly-cmdline", besides 99kdump,
> 95iscsi
>  also generates iscsi related cmdline. IOW, we have duplicate
>  software iscsi cmdlines.
>  
>  95iscsi generated software iscsi cmdline doesn't work, so we
>  remove that of 95iscsi and use that of 99kdump which has been
>  well tested.
>  
>  We can change to use 95iscsi when possible in the future.
>  
>  Signed-off-by: Xunlei Pang <xlpang(a)redhat.com&gt;
>  ---
>   dracut-module-setup.sh | 4 ++++
>   1 file changed, 4 insertions(+)
>  
>  diff --git a/dracut-module-setup.sh b/dracut-module-setup.sh
>  index ae13337..b8a7038 100755
>  --- a/dracut-module-setup.sh
>  +++ b/dracut-module-setup.sh
>  @@ -555,6 +555,10 @@ kdump_setup_iscsi_device() {
>           return
>       fi
>   
>  +    # Remove software iscsi cmdline generated by 99iscsi, 
Should be 95iscsi, I can fix it when applying this patch.

Ack the series. Thanks for the update.

Thanks
Dave

> +    # and let kdump regenerate here.
> +    rm -f ${initdir}/etc/cmdline.d/95iscsi.conf
> +
>      tgt_name=$(kdump_iscsi_get_rec_val ${path} "node.name")
>      tgt_ipaddr=$(kdump_iscsi_get_rec_val ${path}
"node.conn\[0\].address")
>  
> -- 
> 1.8.3.1
>

[Xunlei Pang]

On 09/06/2017 at 02:50 PM, Dave Young wrote:
>  Hi Xunlei,
>  On 09/06/17 at 02:44pm, Xunlei Pang wrote:
> > After adding "--hostonly-cmdline", besides 99kdump, 95iscsi
> > also generates iscsi related cmdline. IOW, we have duplicate
> > software iscsi cmdlines.
> >
> > 95iscsi generated software iscsi cmdline doesn't work, so we
> > remove that of 95iscsi and use that of 99kdump which has been
> > well tested.
> >
> > We can change to use 95iscsi when possible in the future.
> >
> > Signed-off-by: Xunlei Pang <xlpang(a)redhat.com&gt;
> > ---
> >  dracut-module-setup.sh | 4 ++++
> >  1 file changed, 4 insertions(+)
> >
> > diff --git a/dracut-module-setup.sh b/dracut-module-setup.sh
> > index ae13337..b8a7038 100755
> > --- a/dracut-module-setup.sh
> > +++ b/dracut-module-setup.sh
> > @@ -555,6 +555,10 @@ kdump_setup_iscsi_device() {
> >          return
> >      fi
> >  
> > +    # Remove software iscsi cmdline generated by 99iscsi,
>  Should be 95iscsi, I can fix it when applying this patch.
>
>  Ack the series. Thanks for the update. 
Great, thanks!