Merge https://github.com/amluto/virtme/pull/12

2 files changed, 12 insertions, 0 deletions

diff --git a/virtme/commands/run.py b/virtme/commands/run.py
index 9aa8bd0..113b99f 100644
--- a/virtme/commands/run.py
+++ b/virtme/commands/run.py
@@ -60,6 +60,8 @@ def make_parser():
                    help='Allow the host to ask the guest to release memory.')
     g.add_argument('--disk', action='append', default=[], metavar='NAME=PATH',
                    help='Add a read/write virtio-scsi disk.  The device node will be /dev/disk/by-id/scsi-0virtme_disk_NAME.')
+    g.add_argument('--name', action='store', default=None,
+                   help='Set guest hostname and qemu -name flag.')
 
     g = parser.add_argument_group(
         title='Scripting',
@@ -188,6 +190,11 @@ def main():
     qemuargs = [qemu.qemubin]
     kernelargs = []
 
+    # Put the '-name' flag first so it's easily visible in ps, top, etc.
+    if args.name:
+        qemuargs.extend(['-name', args.name])
+        kernelargs.append('virtme_hostname=%s' % args.name)
+
     # Set up virtfs
     export_virtfs(qemu, arch, qemuargs, args.root, '/dev/root', readonly=(not args.rw))
 
diff --git a/virtme/guest/virtme-init b/virtme/guest/virtme-init
index e3b30f0..44a018a 100755
--- a/virtme/guest/virtme-init
+++ b/virtme/guest/virtme-init
@@ -137,6 +137,11 @@ for p in "${!fdlinks[@]}"; do
     [[ -e "$p" ]] || ln -s "${fdlinks[$p]}" "$p"
 done
 
+if [[ -n "$virtme_hostname" ]]; then
+    log "Setting hostname to $virtme_hostname..."
+    hostname "$virtme_hostname"
+fi
+
 # Bring up networking
 ip link set dev lo up