[PATCH 1/2 v2] split nfsroot rpc start code

[PATCH 1/2 v2] split nfsroot rpc start code

[Dave Young]

fstab-sys will mount nonroot nfs as well, so we need to split the necessary
code from nfsroot to start rpc daemon as hook script.

Signed-off-by: Dave Young <dyoung-H+wXaHxf7aLQT0dZR+AlfA@public.gmane.org>
---
 modules.d/95nfs/module-setup.sh  |    1 +
 modules.d/95nfs/nfs-start-rpc.sh |   17 +++++++++++++++++
 modules.d/95nfs/nfsroot          |   15 ---------------
 3 files changed, 18 insertions(+), 15 deletions(-)

Index: dracut/modules.d/95nfs/module-setup.sh
===================================================================
--- dracut.orig/modules.d/95nfs/module-setup.sh
+++ dracut/modules.d/95nfs/module-setup.sh
@@ -57,6 +57,7 @@ install() {
     dracut_install $(for _i in $(ls {/usr,}$libdir/libnss*.so 2>/dev/null); do echo $_i;done | egrep "$_nsslibs")
 
     inst_hook cmdline 90 "$moddir/parse-nfsroot.sh"
+    inst_hook cmdline 91 "$moddir/nfs-start-rpc.sh"
     inst_hook pre-pivot 99 "$moddir/nfsroot-cleanup.sh"
     inst "$moddir/nfsroot" "/sbin/nfsroot"
     mkdir -m 0755 -p "$initdir/var/lib/nfs/rpc_pipefs"
Index: dracut/modules.d/95nfs/nfs-start-rpc.sh
===================================================================
--- /dev/null
+++ dracut/modules.d/95nfs/nfs-start-rpc.sh
@@ -0,0 +1,17 @@
+#!/bin/sh
+# -*- mode: shell-script; indent-tabs-mode: nil; sh-basic-offset: 4; -*-
+# ex: ts=8 sw=4 sts=4 et filetype=sh
+
+# Start rpcbind or rpcbind
+# FIXME occasionally saw 'rpcbind: fork failed: No such device' -- why?
+command -v portmap >/dev/null && [ -z "$(pidof portmap)" ] && portmap
+command -v rpcbind >/dev/null && [ -z "$(pidof rpcbind)" ] && rpcbind
+
+[ ! -d /var/lib/nfs/rpc_pipefs/nfs ] && \
+    mount -t rpc_pipefs rpc_pipefs /var/lib/nfs/rpc_pipefs
+
+# Start rpc.statd as mount won't let us use locks on a NFSv4
+# filesystem without talking to it. NFSv4 does locks internally,
+# rpc.lockd isn't needed
+[ -z "$(pidof rpc.statd)" ] && rpc.statd
+[ -z "$(pidof rpc.idmapd)" ] && rpc.idmapd
Index: dracut/modules.d/95nfs/nfsroot
===================================================================
--- dracut.orig/modules.d/95nfs/nfsroot
+++ dracut/modules.d/95nfs/nfsroot
@@ -84,22 +84,7 @@ getarg rw && nfsrw=rw
 
 options=${options:+$options,}$nfsrw
 
-# Start rpcbind or rpcbind
-# FIXME occasionally saw 'rpcbind: fork failed: No such device' -- why?
-command -v portmap >/dev/null && [ -z "$(pidof portmap)" ] && portmap
-command -v rpcbind >/dev/null && [ -z "$(pidof rpcbind)" ] && rpcbind
-
 if [ "$nfs" = "nfs4" ]; then
-    [ ! -d /var/lib/nfs/rpc_pipefs/nfs ] && \
-         mount -t rpc_pipefs rpc_pipefs /var/lib/nfs/rpc_pipefs
-
-    # Start rpc.statd as mount won't let us use locks on a NFSv4
-    # filesystem without talking to it. NFSv4 does locks internally,
-    # rpc.lockd isn't needed
-    [ -z "$(pidof rpc.statd)" ] && rpc.statd
-
-    [ -z "$(pidof rpc.idmapd)" ] && rpc.idmapd
-
     # XXX Should we loop here?
     mount -t nfs4 -o$options${nfslock+,$nfslock} \
         $server:$path $NEWROOT \

Re: [PATCH 1/2 v2] split nfsroot rpc start code

[Cong Wang]

On Wed, 01 Feb 2012 at 02:00 GMT, Dave Young <dyoung-H+wXaHxf7aLQT0dZR+AlfA@public.gmane.org> wrote:
> fstab-sys will mount nonroot nfs as well, so we need to split the necessary
> code from nfsroot to start rpc daemon as hook script.
>
> Signed-off-by: Dave Young <dyoung-H+wXaHxf7aLQT0dZR+AlfA@public.gmane.org>

Why not Cc me who reviewed your V1 patches? :-/

> ---
>  modules.d/95nfs/module-setup.sh  |    1 +
>  modules.d/95nfs/nfs-start-rpc.sh |   17 +++++++++++++++++
>  modules.d/95nfs/nfsroot          |   15 ---------------
>  3 files changed, 18 insertions(+), 15 deletions(-)
>
> Index: dracut/modules.d/95nfs/module-setup.sh
>===================================================================
> --- dracut.orig/modules.d/95nfs/module-setup.sh
> +++ dracut/modules.d/95nfs/module-setup.sh
> @@ -57,6 +57,7 @@ install() {
>      dracut_install $(for _i in $(ls {/usr,}$libdir/libnss*.so 2>/dev/null); do echo $_i;done | egrep "$_nsslibs")
>  
>      inst_hook cmdline 90 "$moddir/parse-nfsroot.sh"
> +    inst_hook cmdline 91 "$moddir/nfs-start-rpc.sh"

I am sure this is wrong. You need pre-pivot.

Re: [PATCH 1/2 v2] split nfsroot rpc start code

[Dave Young]

On 02/01/2012 03:48 PM, Cong Wang wrote:

> On Wed, 01 Feb 2012 at 02:00 GMT, Dave Young <dyoung-H+wXaHxf7aLQT0dZR+AlfA@public.gmane.org> wrote:
>> fstab-sys will mount nonroot nfs as well, so we need to split the necessary
>> code from nfsroot to start rpc daemon as hook script.
>>
>> Signed-off-by: Dave Young <dyoung-H+wXaHxf7aLQT0dZR+AlfA@public.gmane.org>
> 
> Why not Cc me who reviewed your V1 patches? :-/


Hehe, Will do next time.
I assume you will monitor dracut list. sorry about the lazy.

> 
>> ---
>>  modules.d/95nfs/module-setup.sh  |    1 +
>>  modules.d/95nfs/nfs-start-rpc.sh |   17 +++++++++++++++++
>>  modules.d/95nfs/nfsroot          |   15 ---------------
>>  3 files changed, 18 insertions(+), 15 deletions(-)
>>
>> Index: dracut/modules.d/95nfs/module-setup.sh
>> ===================================================================
>> --- dracut.orig/modules.d/95nfs/module-setup.sh
>> +++ dracut/modules.d/95nfs/module-setup.sh
>> @@ -57,6 +57,7 @@ install() {
>>      dracut_install $(for _i in $(ls {/usr,}$libdir/libnss*.so 2>/dev/null); do echo $_i;done | egrep "$_nsslibs")
>>  
>>      inst_hook cmdline 90 "$moddir/parse-nfsroot.sh"
>> +    inst_hook cmdline 91 "$moddir/nfs-start-rpc.sh"
> 
> I am sure this is wrong. You need pre-pivot.


I want to start them as early as we can, I always think about user use
dracut as a minimal recovery system, they need do something manually.

> 
> --
> To unsubscribe from this list: send the line "unsubscribe initramfs" in
> the body of a message to majordomo-u79uwXL29TY76Z2rM5mHXA@public.gmane.org
> More majordomo info at  http://vger.kernel.org/majordomo-info.html



-- 
Thanks
Dave

Re: [PATCH 1/2 v2] split nfsroot rpc start code

[Cong Wang]

On 02/01/2012 03:56 PM, Dave Young wrote:
> On 02/01/2012 03:48 PM, Cong Wang wrote:
>> On Wed, 01 Feb 2012 at 02:00 GMT, Dave Young<dyoung-H+wXaHxf7aLQT0dZR+AlfA@public.gmane.org>  wrote:
>>> Index: dracut/modules.d/95nfs/module-setup.sh
>>> ===================================================================
>>> --- dracut.orig/modules.d/95nfs/module-setup.sh
>>> +++ dracut/modules.d/95nfs/module-setup.sh
>>> @@ -57,6 +57,7 @@ install() {
>>>       dracut_install $(for _i in $(ls {/usr,}$libdir/libnss*.so 2>/dev/null); do echo $_i;done | egrep "$_nsslibs")
>>>
>>>       inst_hook cmdline 90 "$moddir/parse-nfsroot.sh"
>>> +    inst_hook cmdline 91 "$moddir/nfs-start-rpc.sh"
>>
>> I am sure this is wrong. You need pre-pivot.
>
>
> I want to start them as early as we can, I always think about user use
> dracut as a minimal recovery system, they need do something manually.
>

Then install it as pre-pivot 00.

Do one thing at one time, I know this patch now is for kdump. If you 
really need a minimal recovery system, do that later. :)

Re: [PATCH 1/2 v2] split nfsroot rpc start code

[Dave Young]

On 02/01/2012 03:56 PM, Cong Wang wrote:

> On 02/01/2012 03:56 PM, Dave Young wrote:
>> On 02/01/2012 03:48 PM, Cong Wang wrote:
>>> On Wed, 01 Feb 2012 at 02:00 GMT, Dave Young<dyoung-H+wXaHxf7aLQT0dZR+AlfA@public.gmane.org>  wrote:
>>>> Index: dracut/modules.d/95nfs/module-setup.sh
>>>> ===================================================================
>>>> --- dracut.orig/modules.d/95nfs/module-setup.sh
>>>> +++ dracut/modules.d/95nfs/module-setup.sh
>>>> @@ -57,6 +57,7 @@ install() {
>>>>       dracut_install $(for _i in $(ls {/usr,}$libdir/libnss*.so
>>>> 2>/dev/null); do echo $_i;done | egrep "$_nsslibs")
>>>>
>>>>       inst_hook cmdline 90 "$moddir/parse-nfsroot.sh"
>>>> +    inst_hook cmdline 91 "$moddir/nfs-start-rpc.sh"
>>>
>>> I am sure this is wrong. You need pre-pivot.
>>
>>
>> I want to start them as early as we can, I always think about user use
>> dracut as a minimal recovery system, they need do something manually.
>>
> 
> Then install it as pre-pivot 00.


What if I use rdbreak=point which is before pre-pivot?

> 
> Do one thing at one time, I know this patch now is for kdump. If you
> really need a minimal recovery system, do that later. :)



-- 
Thanks
Dave

Re: [PATCH 1/2 v2] split nfsroot rpc start code

[Dave Young]

On 02/01/2012 04:00 PM, Dave Young wrote:

> On 02/01/2012 03:56 PM, Cong Wang wrote:
> 
>> On 02/01/2012 03:56 PM, Dave Young wrote:
>>> On 02/01/2012 03:48 PM, Cong Wang wrote:
>>>> On Wed, 01 Feb 2012 at 02:00 GMT, Dave Young<dyoung-H+wXaHxf7aLQT0dZR+AlfA@public.gmane.org>  wrote:
>>>>> Index: dracut/modules.d/95nfs/module-setup.sh
>>>>> ===================================================================
>>>>> --- dracut.orig/modules.d/95nfs/module-setup.sh
>>>>> +++ dracut/modules.d/95nfs/module-setup.sh
>>>>> @@ -57,6 +57,7 @@ install() {
>>>>>       dracut_install $(for _i in $(ls {/usr,}$libdir/libnss*.so
>>>>> 2>/dev/null); do echo $_i;done | egrep "$_nsslibs")
>>>>>
>>>>>       inst_hook cmdline 90 "$moddir/parse-nfsroot.sh"
>>>>> +    inst_hook cmdline 91 "$moddir/nfs-start-rpc.sh"
>>>>
>>>> I am sure this is wrong. You need pre-pivot.
>>>
>>>
>>> I want to start them as early as we can, I always think about user use
>>> dracut as a minimal recovery system, they need do something manually.
>>>
>>
>> Then install it as pre-pivot 00.
> 
> 
> What if I use rdbreak=point which is before pre-pivot?
> 
>>
>> Do one thing at one time, I know this patch now is for kdump. If you
>> really need a minimal recovery system, do that later. :)


Generally it's right, but for this issue they are not conflict. I'd like
to think it as a general feature and do not assume it's only for kdump.

-- 
Thanks
Dave

Re: [PATCH 1/2 v2] split nfsroot rpc start code

[Cong Wang]

On 02/01/2012 04:00 PM, Dave Young wrote:
> On 02/01/2012 03:56 PM, Cong Wang wrote:
>
>> On 02/01/2012 03:56 PM, Dave Young wrote:
>>> On 02/01/2012 03:48 PM, Cong Wang wrote:
>>>> On Wed, 01 Feb 2012 at 02:00 GMT, Dave Young<dyoung-H+wXaHxf7aLQT0dZR+AlfA@public.gmane.org>   wrote:
>>>>> Index: dracut/modules.d/95nfs/module-setup.sh
>>>>> ===================================================================
>>>>> --- dracut.orig/modules.d/95nfs/module-setup.sh
>>>>> +++ dracut/modules.d/95nfs/module-setup.sh
>>>>> @@ -57,6 +57,7 @@ install() {
>>>>>        dracut_install $(for _i in $(ls {/usr,}$libdir/libnss*.so
>>>>> 2>/dev/null); do echo $_i;done | egrep "$_nsslibs")
>>>>>
>>>>>        inst_hook cmdline 90 "$moddir/parse-nfsroot.sh"
>>>>> +    inst_hook cmdline 91 "$moddir/nfs-start-rpc.sh"
>>>>
>>>> I am sure this is wrong. You need pre-pivot.
>>>
>>>
>>> I want to start them as early as we can, I always think about user use
>>> dracut as a minimal recovery system, they need do something manually.
>>>
>>
>> Then install it as pre-pivot 00.
>
>
> What if I use rdbreak=point which is before pre-pivot?
>

Take a look at all existing cmdline hooks, all of them handle cmdline, 
but nfs-start-rpc doesn't, so not cmdline hook please. You are abusing 
cmdline hooks.

Re: [PATCH 1/2 v2] split nfsroot rpc start code

[Dave Young]

On 02/01/2012 04:04 PM, Cong Wang wrote:

> On 02/01/2012 04:00 PM, Dave Young wrote:
>> On 02/01/2012 03:56 PM, Cong Wang wrote:
>>
>>> On 02/01/2012 03:56 PM, Dave Young wrote:
>>>> On 02/01/2012 03:48 PM, Cong Wang wrote:
>>>>> On Wed, 01 Feb 2012 at 02:00 GMT, Dave Young<dyoung-H+wXaHxf7aLQT0dZR+AlfA@public.gmane.org>  
>>>>> wrote:
>>>>>> Index: dracut/modules.d/95nfs/module-setup.sh
>>>>>> ===================================================================
>>>>>> --- dracut.orig/modules.d/95nfs/module-setup.sh
>>>>>> +++ dracut/modules.d/95nfs/module-setup.sh
>>>>>> @@ -57,6 +57,7 @@ install() {
>>>>>>        dracut_install $(for _i in $(ls {/usr,}$libdir/libnss*.so
>>>>>> 2>/dev/null); do echo $_i;done | egrep "$_nsslibs")
>>>>>>
>>>>>>        inst_hook cmdline 90 "$moddir/parse-nfsroot.sh"
>>>>>> +    inst_hook cmdline 91 "$moddir/nfs-start-rpc.sh"
>>>>>
>>>>> I am sure this is wrong. You need pre-pivot.
>>>>
>>>>
>>>> I want to start them as early as we can, I always think about user use
>>>> dracut as a minimal recovery system, they need do something manually.
>>>>
>>>
>>> Then install it as pre-pivot 00.
>>
>>
>> What if I use rdbreak=point which is before pre-pivot?
>>
> 
> Take a look at all existing cmdline hooks, all of them handle cmdline,
> but nfs-start-rpc doesn't, so not cmdline hook please. You are abusing
> cmdline hooks.



Maybe current cmdline hooks all deal with cmdline things, but as my
understand cmdline hook point is just a point for injecting anything we
need to handle at this point.


-- 
Thanks
Dave

Re: [PATCH 1/2 v2] split nfsroot rpc start code

[Cong Wang]

On 02/01/2012 04:16 PM, Dave Young wrote:
> On 02/01/2012 04:04 PM, Cong Wang wrote:
>
>> On 02/01/2012 04:00 PM, Dave Young wrote:
>>> On 02/01/2012 03:56 PM, Cong Wang wrote:
>>>
>>>> On 02/01/2012 03:56 PM, Dave Young wrote:
>>>>> On 02/01/2012 03:48 PM, Cong Wang wrote:
>>>>>> On Wed, 01 Feb 2012 at 02:00 GMT, Dave Young<dyoung-H+wXaHxf7aLQT0dZR+AlfA@public.gmane.org>
>>>>>> wrote:
>>>>>>> Index: dracut/modules.d/95nfs/module-setup.sh
>>>>>>> ===================================================================
>>>>>>> --- dracut.orig/modules.d/95nfs/module-setup.sh
>>>>>>> +++ dracut/modules.d/95nfs/module-setup.sh
>>>>>>> @@ -57,6 +57,7 @@ install() {
>>>>>>>         dracut_install $(for _i in $(ls {/usr,}$libdir/libnss*.so
>>>>>>> 2>/dev/null); do echo $_i;done | egrep "$_nsslibs")
>>>>>>>
>>>>>>>         inst_hook cmdline 90 "$moddir/parse-nfsroot.sh"
>>>>>>> +    inst_hook cmdline 91 "$moddir/nfs-start-rpc.sh"
>>>>>>
>>>>>> I am sure this is wrong. You need pre-pivot.
>>>>>
>>>>>
>>>>> I want to start them as early as we can, I always think about user use
>>>>> dracut as a minimal recovery system, they need do something manually.
>>>>>
>>>>
>>>> Then install it as pre-pivot 00.
>>>
>>>
>>> What if I use rdbreak=point which is before pre-pivot?
>>>
>>
>> Take a look at all existing cmdline hooks, all of them handle cmdline,
>> but nfs-start-rpc doesn't, so not cmdline hook please. You are abusing
>> cmdline hooks.
>
>
>
> Maybe current cmdline hooks all deal with cmdline things, but as my
> understand cmdline hook point is just a point for injecting anything we
> need to handle at this point.

If you think pre-pivot is too late, then try other hooks, e.g. 
pre-mount, pre-udev. Anyhow, cmdline is definitely not the place.

Re: [PATCH 1/2 v2] split nfsroot rpc start code

[Dave Young]

On 02/01/2012 04:20 PM, Cong Wang wrote:

> On 02/01/2012 04:16 PM, Dave Young wrote:
>> On 02/01/2012 04:04 PM, Cong Wang wrote:
>>
>>> On 02/01/2012 04:00 PM, Dave Young wrote:
>>>> On 02/01/2012 03:56 PM, Cong Wang wrote:
>>>>
>>>>> On 02/01/2012 03:56 PM, Dave Young wrote:
>>>>>> On 02/01/2012 03:48 PM, Cong Wang wrote:
>>>>>>> On Wed, 01 Feb 2012 at 02:00 GMT, Dave Young<dyoung-H+wXaHxf7aLQT0dZR+AlfA@public.gmane.org>
>>>>>>> wrote:
>>>>>>>> Index: dracut/modules.d/95nfs/module-setup.sh
>>>>>>>> ===================================================================
>>>>>>>> --- dracut.orig/modules.d/95nfs/module-setup.sh
>>>>>>>> +++ dracut/modules.d/95nfs/module-setup.sh
>>>>>>>> @@ -57,6 +57,7 @@ install() {
>>>>>>>>         dracut_install $(for _i in $(ls {/usr,}$libdir/libnss*.so
>>>>>>>> 2>/dev/null); do echo $_i;done | egrep "$_nsslibs")
>>>>>>>>
>>>>>>>>         inst_hook cmdline 90 "$moddir/parse-nfsroot.sh"
>>>>>>>> +    inst_hook cmdline 91 "$moddir/nfs-start-rpc.sh"
>>>>>>>
>>>>>>> I am sure this is wrong. You need pre-pivot.
>>>>>>
>>>>>>
>>>>>> I want to start them as early as we can, I always think about user
>>>>>> use
>>>>>> dracut as a minimal recovery system, they need do something manually.
>>>>>>
>>>>>
>>>>> Then install it as pre-pivot 00.
>>>>
>>>>
>>>> What if I use rdbreak=point which is before pre-pivot?
>>>>
>>>
>>> Take a look at all existing cmdline hooks, all of them handle cmdline,
>>> but nfs-start-rpc doesn't, so not cmdline hook please. You are abusing
>>> cmdline hooks.
>>
>>
>>
>> Maybe current cmdline hooks all deal with cmdline things, but as my
>> understand cmdline hook point is just a point for injecting anything we
>> need to handle at this point.
> 
> If you think pre-pivot is too late, then try other hooks, e.g.
> pre-mount, pre-udev. Anyhow, cmdline is definitely not the place.
> 

Sigh, Ok. I will test pre-udev

-- 
Thanks
Dave