finish up #38 & #39

Author: ryran

README.md

@@ -15,6 +15,9 @@ upvm might not be for you if:
 - you already have all the images you need in a RHEV environment
 - you want to spin up new machines in an OpenStack cloud
 
+#### I don't like image files! LVM is the best!
+I used to use LVM for all my VMs too ... so upvm can use `virt-builder` to generate an image and then write that image out to a block device you specify with the `--primary-blockdev` option. This optional feature of course requires some sudo access (to run [dd-helper.py](https://github.com/ryran/upvm/blob/master/dd-helper.py) as root) which upvm will walk you through the first time you do it.
+
 ## Install
 
 #### yum/dnf (RPM) install in RHEL 7.2+ or Fedora 22+:
@@ -51,20 +54,20 @@ Are you annoyed with always having to open the `virt-manager` GUI to do stuff wi
 ## Help page
 
 ```
-$ upvm --help
 usage: upvm [--loglevel {debug,info,error}] [--build-image-only] [--nocolor]
             [--noconsole] [--cachedir VBCACHEDIR] [-h] [--help] [-l]
             [--arch {x86_64,i386,i686,ia64,armv71,ppc,ppc64,ppc64le,aarch64,sparc64,s390,s390x}]
             [--info] [-n VMNAME] [--os-variant OS] [--root-password SELECTOR]
             [--dnsdomain DOMAIN] [--hostname HOSTNAME | --hostname-prompt]
             [--no-dhcphostname] [--img-dir DIR] [--img-size SIZE]
             [--img-format {auto,raw,qcow2}] [--timezone TIMEZONE]
-            [--rhsm-key ORGID:KEY] [--ssh-pubkey FILE] [--upload FILE:DEST]
-            [--run SCRIPT] [--run-command CMD+ARGS] [--firstboot SCRIPT]
+            [--ssh-pubkey FILE] [--upload FILE:DEST] [--run SCRIPT]
+            [--run-command CMD+ARGS] [--firstboot SCRIPT]
             [--firstboot-command CMD+ARGS] [--install PKG,PKG,@GROUP...]
             [--firstboot-install PKG,PKG,@GROUP...] [--selinux-relabel]
-            [--vbuilder-arg ARG] [-m OPTIONS] [-c OPTIONS] [-d OPTIONS]
-            [-w OPTIONS] [--boot OPTIONS | --uefi] [--vinstall-arg ARG]
+            [--vbuilder-arg ARG] [--primary-blockdev BLOCKDEV] [-m OPTIONS]
+            [-c OPTIONS] [-d OPTIONS] [-w OPTIONS] [--boot OPTIONS | --uefi]
+            [--vinstall-arg ARG]
             [TEMPLATE]
 
 Leverage virt-builder & virt-install to spin up new VMs with ease
@@ -149,17 +152,6 @@ TOTALLY OPTIONAL OS-LEVEL OPTIONS:
                         syntax, i.e., paths rooted in /usr/share/zoneinfo,
                         e.g.: 'Europe/London' or 'America/Los_Angeles' or
                         'Asia/Calcutta')
-  --rhsm-key ORGID:KEY  With or without this option, upvm creates a
-                        /root/register script inside the guest which can be
-                        used to interactively register to RHN Classic or RHSM;
-                        this option edits that script to include an RHSM
-                        activation key created by you at
-                        access.redhat.com/management/activation_keys -- i.e.,
-                        so the script can be run without requiring a
-                        user/password (to use this option, specify both the
-                        organization ID and the activation key, e.g.,
-                        '0123456789:my_activation_key'); IMPORTANT NOTE: this
-                        does not run the /root/register script for you
   --ssh-pubkey FILE     Inject specific ssh pubkeys (option may be used more
                         than once) into the /root/.ssh/authorized_keys file of
                         the guest (default: contents of local
@@ -201,10 +193,18 @@ TOTALLY OPTIONAL OS-LEVEL OPTIONS:
                         in=/localpath:/mnt/remote')
 
 TOTALLY OPTIONAL HARDWARE-LEVEL (VM) OPTIONS:
-  Guest hardware configured by virt-install (after image is built). Each option
-  corresponds with virt-install option of same name. More configurability is
+  Guest hardware configured by virt-install (after image is built). Most options
+  correspond with virt-install options of same name. More configurability is
   possible than described. See virt-install man page.
 
+  --primary-blockdev BLOCKDEV
+                        To use this option, specify a BLOCKDEV like
+                        '/dev/sdb2' or '/dev/vg/logvol' and then in that case,
+                        the image generated by virt-builder [using the above
+                        options] will be written to BLOCKDEV and then deleted;
+                        the first time you try this as a non-root user, upvm
+                        will exit with a warning explaining how to add the
+                        appropriate sudo access to the dd helper-wrapper
   -m, --memory OPTIONS  If this option is omitted, the guest will be defined
                         with a RAM allocation of 1024 MiB; in its simplest
                         form OPTIONS can be the amount of RAM in MiB; more
@@ -262,6 +262,6 @@ ABOUT CONFIG FILES:
   override config file values which override defaults.
 
 VERSION:
-  upvm v0.10.5 last mod 2016/02/14
+  upvm v0.10.6 last mod 2016/02/16
   See <http://github.com/ryran/upvm> to report bugs or RFEs
 ```

dd-helper.py

@@ -16,18 +16,20 @@
 # limitations under the License.
 #-------------------------------------------------------------------------------
 
-# Modules from standard library
-from subprocess import call
+import subprocess
 from sys import argv, exit
-if len(argv) != 3:
-    print("Improper arguments")
+from os import devnull
+outfile, infile = argv[1], argv[2]
+null = open(devnull, 'w')
+rc = subprocess.call(['findmnt', '-no', 'target', outfile], stdout=null, stderr=null)
+if rc == 0:
+    # If findmnt reports outfile is mounted
     exit(2)
-cmd = [
-    'nice', '-n', '19',
-    'dd',
-    'of={}'.format(argv[1]),
-    'if={}'.format(argv[2]),
-    'bs=1M',
-    ]
-rc = call(cmd)
-exit(rc)
+lsof = subprocess.Popen(['nice', 'lsof', '-tlS', outfile], stdout=subprocess.PIPE, stderr=null)
+output = lsof.communicate()[0]
+if output:
+    # If lsof reports anything using our outfile
+    exit(3)
+null.close()
+dd = ['nice', 'dd', 'of={}'.format(outfile), 'if={}'.format(infile), 'bs=1M']
+exit(subprocess.call(dd))

modules/argparser.py

@@ -190,9 +190,9 @@ def parse():
     grpAA.add_argument(
         '--timezone',
         help="Set system timezone inside the OS (use traditional syntax, i.e., paths rooted in /usr/share/zoneinfo, e.g.: 'Europe/London' or 'America/Los_Angeles' or 'Asia/Calcutta')")
-    grpAA.add_argument(
-        '--rhsm-key', metavar='ORGID:KEY',
-        help="With or without this option, {} creates a /root/register script inside the guest which can be used to interactively register to RHN Classic or RHSM; this option edits that script to include an RHSM activation key created by you at access.redhat.com/management/activation_keys -- i.e., so the script can be run without requiring a user/password (to use this option, specify both the organization ID and the activation key, e.g., '0123456789:my_activation_key'); IMPORTANT NOTE: this does not run the /root/register script for you".format(cfg.prog))
+    # grpAA.add_argument(
+    #     '--rhsm-key', metavar='ORGID:KEY',
+    #     help="With or without this option, {} creates a /root/register script inside the guest which can be used to interactively register to RHN Classic or RHSM; this option edits that script to include an RHSM activation key created by you at access.redhat.com/management/activation_keys -- i.e., so the script can be run without requiring a user/password (to use this option, specify both the organization ID and the activation key, e.g., '0123456789:my_activation_key'); IMPORTANT NOTE: this does not run the /root/register script for you".format(cfg.prog))
     grpAA.add_argument(
         '--ssh-pubkey', metavar='FILE', action='append',
         default=['~/.ssh/authorized_keys', '~/.ssh/id_[dr]sa.pub', '~/.ssh/id_ecdsa.pub', '~/.ssh/id_ed25519.pub'],
@@ -230,7 +230,7 @@ def parse():
         description="Guest hardware configured by virt-install (after image is built). Most options\ncorrespond with virt-install options of same name. More configurability is\npossible than described. See virt-install man page.")
     grpBB.add_argument(
         '--primary-blockdev', metavar='BLOCKDEV',
-        help="To use this option, specify a BLOCKDEV like '/dev/sdb2' or '/dev/vg/logvol' and then in that case, the image generated by virt-builder [using the above options] will be written to BLOCKDEV and then deleted; the first time you try this as a non-root user, {} will exit with a warning explaining how to add the appropriate sudo access".format(cfg.prog))
+        help="To use this option, specify a BLOCKDEV like '/dev/sdb2' or '/dev/vg/logvol' and then in that case, the image generated by virt-builder [using the above options] will be written to BLOCKDEV and then deleted; the first time you try this as a non-root user, {} will exit with a warning explaining how to add the appropriate sudo access to the dd helper-wrapper".format(cfg.prog))
     grpBB.add_argument(
         '-m', '--memory', metavar='OPTIONS', default=1024,
         help="If this option is omitted, the guest will be defined with a RAM allocation of 1024 MiB; in its simplest form OPTIONS can be the amount of RAM in MiB; more complicated example: '-m 512,maxmemory=4096' (which would set the default to 512 MiB but allow raising up to 4 GiB without powering off)")