* [PATCH] split out nfs rpc process startup
@ 2012-01-30 6:43 Dave Young
2012-01-30 8:18 ` Cong Wang
0 siblings, 1 reply; 5+ messages in thread
From: Dave Young @ 2012-01-30 6:43 UTC (permalink / raw)
To: initramfs-u79uwXL29TY76Z2rM5mHXA
fstab-sys will mount nonroot nfs as well, so we need to split the necessary
code from netroot for fstab-sys use.
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 | 22 ++++++++++++++++++++++
modules.d/95nfs/nfsroot | 16 ++--------------
3 files changed, 25 insertions(+), 14 deletions(-)
Index: dracut/modules.d/95nfs/module-setup.sh
===================================================================
--- dracut.orig/modules.d/95nfs/module-setup.sh
+++ dracut/modules.d/95nfs/module-setup.sh
@@ -59,6 +59,7 @@ install() {
inst_hook cmdline 90 "$moddir/parse-nfsroot.sh"
inst_hook pre-pivot 99 "$moddir/nfsroot-cleanup.sh"
inst "$moddir/nfsroot" "/sbin/nfsroot"
+ inst "$moddir/nfs-start-rpc" "/sbin/nfs-start-rpc"
mkdir -m 0755 -p "$initdir/var/lib/nfs/rpc_pipefs"
mkdir -m 0755 -p "$initdir/var/lib/rpcbind"
mkdir -m 0755 -p "$initdir/var/lib/nfs/statd/sm"
Index: dracut/modules.d/95nfs/nfs-start-rpc
===================================================================
--- /dev/null
+++ dracut/modules.d/95nfs/nfs-start-rpc
@@ -0,0 +1,22 @@
+#!/bin/sh
+# -*- mode: shell-script; indent-tabs-mode: nil; sh-basic-offset: 4; -*-
+# ex: ts=8 sw=4 sts=4 et filetype=sh
+
+nfsstart() {
+ # 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 [ "$1" = "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
+ fi
+}
Index: dracut/modules.d/95nfs/nfsroot
===================================================================
--- dracut.orig/modules.d/95nfs/nfsroot
+++ dracut/modules.d/95nfs/nfsroot
@@ -84,22 +84,10 @@ 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
+. /sbin/nfs-start-rpc
+nfsstart $nfs
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 \
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [PATCH] split out nfs rpc process startup
2012-01-30 6:43 [PATCH] split out nfs rpc process startup Dave Young
@ 2012-01-30 8:18 ` Cong Wang
2012-01-30 8:39 ` Dave Young
0 siblings, 1 reply; 5+ messages in thread
From: Cong Wang @ 2012-01-30 8:18 UTC (permalink / raw)
To: initramfs-u79uwXL29TY76Z2rM5mHXA
On Mon, 30 Jan 2012 at 06:43 GMT, Dave Young <dyoung-H+wXaHxf7aLQT0dZR+AlfA@public.gmane.org> wrote:
> Index: dracut/modules.d/95nfs/nfs-start-rpc
>===================================================================
> --- /dev/null
> +++ dracut/modules.d/95nfs/nfs-start-rpc
> @@ -0,0 +1,22 @@
> +#!/bin/sh
> +# -*- mode: shell-script; indent-tabs-mode: nil; sh-basic-offset: 4; -*-
> +# ex: ts=8 sw=4 sts=4 et filetype=sh
> +
> +nfsstart() {
> + # 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 [ "$1" = "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
> + fi
> +}
> Index: dracut/modules.d/95nfs/nfsroot
>===================================================================
> --- dracut.orig/modules.d/95nfs/nfsroot
> +++ dracut/modules.d/95nfs/nfsroot
> @@ -84,22 +84,10 @@ 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
> +. /sbin/nfs-start-rpc
> +nfsstart $nfs
Huh? Why making nfsstart a function and source it here?
Why not just make nfsstart as a script and invoke that script here?
This reads odd to me.
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [PATCH] split out nfs rpc process startup
[not found] ` <4F26572E.7030806-H+wXaHxf7aLQT0dZR+AlfA@public.gmane.org>
@ 2012-01-30 8:38 ` Cong Wang
[not found] ` <4F265712.7090302-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>
0 siblings, 1 reply; 5+ messages in thread
From: Cong Wang @ 2012-01-30 8:38 UTC (permalink / raw)
To: Dave Young; +Cc: initramfs-u79uwXL29TY76Z2rM5mHXA
On 01/30/2012 04:39 PM, Dave Young wrote:
>
> no special reason for this, I'm fine to make it a script
>
Sourcing a script under /sbin is odd. Please make it a single script,
for other scripts to call it more easily. :)
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [PATCH] split out nfs rpc process startup
2012-01-30 8:18 ` Cong Wang
@ 2012-01-30 8:39 ` Dave Young
[not found] ` <4F26572E.7030806-H+wXaHxf7aLQT0dZR+AlfA@public.gmane.org>
0 siblings, 1 reply; 5+ messages in thread
From: Dave Young @ 2012-01-30 8:39 UTC (permalink / raw)
To: Cong Wang; +Cc: initramfs-u79uwXL29TY76Z2rM5mHXA
On 01/30/2012 04:18 PM, Cong Wang wrote:
> On Mon, 30 Jan 2012 at 06:43 GMT, Dave Young <dyoung-H+wXaHxf7aLQT0dZR+AlfA@public.gmane.org> wrote:
>> Index: dracut/modules.d/95nfs/nfs-start-rpc
>> ===================================================================
>> --- /dev/null
>> +++ dracut/modules.d/95nfs/nfs-start-rpc
>> @@ -0,0 +1,22 @@
>> +#!/bin/sh
>> +# -*- mode: shell-script; indent-tabs-mode: nil; sh-basic-offset: 4; -*-
>> +# ex: ts=8 sw=4 sts=4 et filetype=sh
>> +
>> +nfsstart() {
>> + # 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 [ "$1" = "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
>> + fi
>> +}
>> Index: dracut/modules.d/95nfs/nfsroot
>> ===================================================================
>> --- dracut.orig/modules.d/95nfs/nfsroot
>> +++ dracut/modules.d/95nfs/nfsroot
>> @@ -84,22 +84,10 @@ 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
>> +. /sbin/nfs-start-rpc
>> +nfsstart $nfs
>
> Huh? Why making nfsstart a function and source it here?
> Why not just make nfsstart as a script and invoke that script here?
> This reads odd to me.
no special reason for this, I'm fine to make it a script
>
> --
> 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
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [PATCH] split out nfs rpc process startup
[not found] ` <4F265712.7090302-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>
@ 2012-01-30 9:03 ` Dave Young
0 siblings, 0 replies; 5+ messages in thread
From: Dave Young @ 2012-01-30 9:03 UTC (permalink / raw)
To: Cong Wang; +Cc: initramfs-u79uwXL29TY76Z2rM5mHXA
On 01/30/2012 04:38 PM, Cong Wang wrote:
> On 01/30/2012 04:39 PM, Dave Young wrote:
>>
>> no special reason for this, I'm fine to make it a script
>>
>
> Sourcing a script under /sbin is odd. Please make it a single script,
> for other scripts to call it more easily. :)
Ok, will do
--
Thanks
Dave
^ permalink raw reply [flat|nested] 5+ messages in thread
end of thread, other threads:[~2012-01-30 9:03 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2012-01-30 6:43 [PATCH] split out nfs rpc process startup Dave Young
2012-01-30 8:18 ` Cong Wang
2012-01-30 8:39 ` Dave Young
[not found] ` <4F26572E.7030806-H+wXaHxf7aLQT0dZR+AlfA@public.gmane.org>
2012-01-30 8:38 ` Cong Wang
[not found] ` <4F265712.7090302-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>
2012-01-30 9:03 ` Dave Young
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.