From 7704f63a57d21afd19d7c98830e5be172b454e9a Mon Sep 17 00:00:00 2001
From: Daniel Kahn Gillmor <dkg@fifthhorseman.net>
Date: Wed, 11 Nov 2009 13:17:29 -0500
Subject: fix MAC address updates.

---
 kvm-creator | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

(limited to 'kvm-creator')

diff --git a/kvm-creator b/kvm-creator
index 12ad8be..b27af0a 100755
--- a/kvm-creator
+++ b/kvm-creator
@@ -19,10 +19,11 @@ DISK="/dev/mapper/${VG}-${NAME}"
 ls /etc/sv/kvm/* &> /dev/null
 if [ "$?" -eq 0 ]; then
   TAP="${5:-tap$(( $( cat /etc/sv/kvm/*/env/TAP | sed 's/^tap//' | sort -n  | tail -n 1 ) + 1 ))}"
-  MAC="${6:-$(cat /etc/sv/kvm/*/env/MAC | head -n1 | cut -f 1-5 -d: ):$(( $( cat /etc/sv/kvm/*/env/MAC | cut -f 6 -d:  | sort -n  | tail -n 1 ) + 1 ))}"
+  MAC="${6:-$(printf "%s:%02x" "$(cat /etc/sv/kvm/*/env/MAC | sort | head -n1 | cut -f 1-5 -d: )" "$(( 0x$( cat /etc/sv/kvm/*/env/MAC | cut -f 6 -d:  | sort -n  | tail -n 1 ) + 1 ))" )}"
 else
   TAP=tap0
-  MAC=00:00:00:00:00:00
+  # use a locally-administered MAC address:
+  MAC=02:00:00:00:00:01
 fi
 
 usage() {
-- 
cgit v1.2.3