[OE-core] [PATCH 1/1] runqemu: drop RPC ports

[Brian Avery]

looks good 2 me!
ty,
b
an intel employee

On Thu, Jun 22, 2017 at 1:30 AM, Robert Yang <liezhi.yang at windriver.com>
wrote:

> The following commit has removed rpc ports from runqemu-export-rootfs, so
> runqemu should also remove them, otherwise "runqemu nfs" doesn't work. And
> use
> abspath for nfsroot, otherwise it doesn't work when it is a relative path.
>
> commit 6bb9860ef7ba9c84fe9bd3a81aa6555f67ebd38e
> Author: Cody P Schafer <dev at codyps.com>
> Date:   Tue Jun 6 18:30:49 2017 -0400
>
>     runqemu-export-rootfs: don't change RPC ports
>
> [YOCTO #11687]
>
> Signed-off-by: Robert Yang <liezhi.yang at windriver.com>
> ---
>  scripts/runqemu | 8 ++------
>  1 file changed, 2 insertions(+), 6 deletions(-)
>
> diff --git a/scripts/runqemu b/scripts/runqemu
> index 26328e5b512..41b870c9f7c 100755
> --- a/scripts/runqemu
> +++ b/scripts/runqemu
> @@ -784,16 +784,12 @@ class BaseConfig(object):
>              all_instances.sort(key=int)
>              self.nfs_instance = int(all_instances.pop()) + 1
>
> -        mountd_rpcport = 21111 + self.nfs_instance
> -        nfsd_rpcport = 11111 + self.nfs_instance
>          nfsd_port = 3049 + 2 * self.nfs_instance
>          mountd_port = 3048 + 2 * self.nfs_instance
>
>          # Export vars for runqemu-export-rootfs
>          export_dict = {
>              'NFS_INSTANCE': self.nfs_instance,
> -            'MOUNTD_RPCPORT': mountd_rpcport,
> -            'NFSD_RPCPORT': nfsd_rpcport,
>              'NFSD_PORT': nfsd_port,
>              'MOUNTD_PORT': mountd_port,
>          }
> @@ -801,7 +797,7 @@ class BaseConfig(object):
>              # Use '%s' since they are integers
>              os.putenv(k, '%s' % v)
>
> -        self.unfs_opts="nfsvers=3,port=%s,mountprog=%s,nfsprog=%s,udp,mountport=%s"
> % (nfsd_port, mountd_rpcport, nfsd_rpcport, mountd_port)
> +        self.unfs_opts="nfsvers=3,port=%s,udp,mountport=%s" %
> (nfsd_port, mountd_port)
>
>          # Extract .tar.bz2 or .tar.bz if no nfs dir
>          if not (self.rootfs and os.path.isdir(self.rootfs)):
> @@ -1006,7 +1002,7 @@ class BaseConfig(object):
>
>          if self.fstype == 'nfs':
>              self.rootfs_options = ''
> -            k_root = '/dev/nfs nfsroot=%s:%s,%s' % (self.nfs_server,
> self.rootfs, self.unfs_opts)
> +            k_root = '/dev/nfs nfsroot=%s:%s,%s' % (self.nfs_server,
> os.path.abspath(self.rootfs), self.unfs_opts)
>              self.kernel_cmdline = 'root=%s rw highres=off' % k_root
>
>          if self.fstype == 'none':
> --
> 2.11.0
>
> --
> _______________________________________________
> Openembedded-core mailing list
> Openembedded-core at lists.openembedded.org
> http://lists.openembedded.org/mailman/listinfo/openembedded-core
>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.openembedded.org/pipermail/openembedded-core/attachments/20170622/05d613c1/attachment-0002.html>