OS-7685 smartos-live overlay should be merged into illumos-joyent

Reviewed by: Jerry Jelinek <[email protected]> Reviewed by: Mike Gerdts <[email protected]> Approved by: Mike Gerdts <[email protected]>
marsell · Aug 1, 2019 · d0ca2b0 · d0ca2b0
1 parent 7f874eb
commit d0ca2b0
Show file tree

Hide file tree

Showing 147 changed files with 20,960 additions and 1,637 deletions.
diff --git a/.gitignore b/.gitignore
@@ -3132,23 +3132,6 @@ usr/src/head/rpcsvc/ufs_prot.h
 usr/src/install-nd-i386.out
 usr/src/lib/abi/apptrace/common/abienv.i
 usr/src/lib/abi/apptrace/common/apptrace.i
-usr/src/lib/brand/joyent/zone/jattach
-usr/src/lib/brand/joyent/zone/jdetach
-usr/src/lib/brand/joyent/zone/jinstall
-usr/src/lib/brand/joyent/zone/juninstall
-usr/src/lib/brand/joyent/zone/pinstall
-usr/src/lib/brand/joyent/zone/poststate
-usr/src/lib/brand/joyent/zone/prestate
-usr/src/lib/brand/joyent/zone/query
-usr/src/lib/brand/joyent/zone/statechange
-usr/src/lib/brand/kvm/zone/kattach
-usr/src/lib/brand/kvm/zone/kdetach
-usr/src/lib/brand/kvm/zone/kinstall
-usr/src/lib/brand/kvm/zone/kuninstall
-usr/src/lib/brand/kvm/zone/pinstall
-usr/src/lib/brand/kvm/zone/poststate
-usr/src/lib/brand/kvm/zone/prestate
-usr/src/lib/brand/kvm/zone/statechange
 usr/src/lib/brand/lx/cmd/ifconfig
 usr/src/lib/brand/lx/cmd/lx_isaexec_wrapper
 usr/src/lib/brand/lx/cmd/lx_lockd