From 3c8886a9ea8aca892e2279b452889f0032c1ab5e Mon Sep 17 00:00:00 2001
From: Guido Trotter <ultrotter@google.com>
Date: Mon, 20 Oct 2008 13:43:54 +0000
Subject: [PATCH] Add mac option to gnt-backup import

Before 'auto' was the only allowed possibility

Forward-port-of: r1885, Reviewed-by: iustinp

Reviewed-by: imsnah
---
 scripts/gnt-backup | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/scripts/gnt-backup b/scripts/gnt-backup
index d7f6b4fa7..fd7b18a0c 100755
--- a/scripts/gnt-backup
+++ b/scripts/gnt-backup
@@ -110,7 +110,7 @@ def ImportInstance(opts, args):
                                 ip_check=opts.ip_check,
                                 ip=opts.ip, bridge=opts.bridge, start=False,
                                 src_node=opts.src_node, src_path=opts.src_dir,
-                                wait_for_sync=opts.wait_for_sync, mac="auto",
+                                wait_for_sync=opts.wait_for_sync, mac=opts.mac,
                                 file_storage_dir=opts.file_storage_dir,
                                 file_driver=opts.file_driver,
                                 iallocator=opts.iallocator,
@@ -166,6 +166,9 @@ import_opts = [
   make_option("-b", "--bridge", dest="bridge",
               help="Bridge to connect this instance to",
               default=None, metavar="<bridge>"),
+  make_option("--mac", dest="mac",
+              help="MAC address ('auto' [default], or specify address)",
+              default='auto', type="string", metavar="<MACADDRESS>"),
   make_option("--src-node", dest="src_node", help="Source node",
               metavar="<node>"),
   make_option("--src-dir", dest="src_dir", help="Source directory",
-- 
GitLab