TRITON-2137 expunge v8plus users (#38)

Reviewed by: Tim Foster <tim.foster@joyent.com>

tools/buildimage/lib/imgadm/README.md

@@ -3,20 +3,16 @@ smartos-live@c6f5e9955adbc45688074ab1b8cac5d340262c56
 
 The following modifications were made:
  - we should allow running from a non-global zone
- - we should not use platform node.js modules
-   (locker.js and zfs.js, mentioned below)
+ - we should not use platform node.js modules like zfs.js
  - we should allow the caller to set the default zpool name
  - we should allow the use of 'pigz' if it exists to
    create .gz files, falling back to 'gzip' otherwise
  - we should attempt to locate a delegated dataset within
    this instance.
 
-A recursive diff of the changes are available in imgadm.patch
-
 The files from smartos-live.git duplicated in this directory are:
 
 smartos-live.git:src/img
-smartos-live.git:src/node_modules/locker.js
 smartos-live.git:src/node_modules/zfs.js
 
 package.json for this copy of imgadm differs from the smartos-live.git

tools/buildimage/lib/imgadm/lib/imgadm.js

@@ -52,7 +52,7 @@ var fs = require('fs');
 var genUuid = require('node-uuid');
 var imgapi = require('sdc-clients/lib/imgapi');
 var imgmanifest = require('imgmanifest');
-var lock = require('./locker.js').lock;
+var qlocker = require('qlocker');
 var mkdirp = require('mkdirp');
 var once = require('once');
 var path = require('path');
@@ -2105,7 +2105,7 @@ IMGADM.prototype._lockAcquire = function _lockAcquire(opts, cb) {
             var lockPath = self._lockPathFromUuid(uuid);
             log.debug({uuid: uuid, lockPath: lockPath}, 'acquiring lock');
 
-            lock(lockPath, function (lockErr, unlockFn) {
+            qlocker.lock(lockPath, function (lockErr, unlockFn) {
                 if (acquireLogTimeout) {
                     clearTimeout(acquireLogTimeout);
                 }