LINUXCN-3: disklayout broke during rebase

Details

Issue Type:Bug
Priority:4 - Normal
Status:Resolved
Created at:2021-08-12T16:34:51.240Z
Updated at:2021-08-31T20:08:22.101Z

People

Created by:Brian Bennett
Reported by:Brian Bennett

Resolution

Fixed: A fix for this issue is checked into the tree and tested.
(Resolution Date: 2021-08-31T20:08:22.094Z)

Labels

linuxcn

Description

root@LXH8DY842:~# disklayout 
/usr/triton/bin/disklayout:50
			if (excluded.indexOf(disk.name.toLowerCase()) !== -1)
			                     ^

ReferenceError: disk is not defined
    at /usr/triton/bin/disklayout:50:25
    at Array.filter (<anonymous>)
    at dolayout (/usr/triton/bin/disklayout:49:17)
    at /usr/triton/bin/disklayout:146:3
    at /usr/lib/node_modules/zfs.js:118:3
    at ChildProcess.exithandler (child_process.js:381:7)
    at ChildProcess.emit (events.js:400:28)
    at maybeClose (internal/child_process.js:1055:16)
    at Socket.<anonymous> (internal/child_process.js:441:11)
    at Socket.emit (events.js:400:28)

Comments

Comment by Brian Bennett
Created at 2021-08-31T20:08:13.347Z

Fixed in smartos-live

master:

commit 25b8e95719778b2bee81e984a37c8b287d1623dd (HEAD -> master, origin/release-20210826, origin/master)
Author: Brian Bennett <brian.bennett@joyent.com>
Date:   Tue Aug 17 12:52:50 2021 -0700

    TRITON-2242 zfs.js needs to be reconciled across smartos-live, node-zfs and node-zfs/linuxcn (#997)
    
    * TRITON-2242 zfs.js needs to be reconciled across smartos-live, node-zfs and node-zfs/linuxcn
    
    This includes changes from node-zfs for the following:
    
    * CNAPI-286
    * AGENT-645
    * AGENT-785
    * TOOLS-607


linuxcn:

commit 01046d09e7e92f93dc80da65856c588416e0d65e (HEAD -> linuxcn, pr/linuxcn, origin/linuxcn)
Author: Brian Bennett <brian.bennett@joyent.com>
Date:   Thu Aug 12 09:35:32 2021 -0700

    LINUXCN-3 disklayout broke during rebase