vx32

commit 4aeb57b201557db9ea9aada9700db91e23cca0ea
parent de3ea443e6500674d807a54b9be6a160388d2023
Author: Jesus Galan Lopez (yiyus) <yiyu.jgl@gmail.com>
Date:   Mon, 21 Jun 2010 19:07:00 +0200

s/-m/-a/ to set macaddress (-m will set memory size)

Diffstat:
doc/9vx.1
 | 
2
+-
src/9vx/main.c
 | 
10
+++++-----

2 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/doc/9vx.1 b/doc/9vx.1
@@ -85,7 +85,7 @@ is not specified, pcap will use the first one available, and tap will use the
 .I tap0
 device. More than one virtual ethernet device can be used. In absence of virtual devices, the network stack of the host system will be used.
 .TP
-.BI -m " macaddress"
+.BI -a " macaddress"
 Use the hardware address
 .I macaddress
 for the last given virtual network device.
diff --git a/src/9vx/main.c b/src/9vx/main.c
@@ -85,7 +85,7 @@ void
 usage(void)
 {
 	// TODO(yy): add debug and other options by ron
-	fprint(2, "usage: 9vx [-p file.ini] [-bfgit] [-n [tap] [netdev]] [-m macaddr] [-r root] [-u user]\n");
+	fprint(2, "usage: 9vx [-p file.ini] [-bfgit] [-n [tap] [netdev]] [-a macaddr] [-r root] [-u user]\n");
 	exit(1);
 }
 
@@ -142,6 +142,9 @@ main(int argc, char **argv)
 		break;
 	
 	/* real options */
+	case 'a':
+		setmac(EARGF(usage()));
+		break;
 	case 'b':
 		bootboot = 1;
 		break;
@@ -158,9 +161,6 @@ main(int argc, char **argv)
 	case 'p':
 		inifile = EARGF(usage());
 		break;
-	case 'm':
-		setmac(EARGF(usage()));
-		break;
 	case 'n':
 		vetap = 0;
 		vedev = ARGF();
@@ -249,7 +249,7 @@ main(int argc, char **argv)
 		if(ve[i].dev != nil)
 			print("%s ", ve[i].dev);
 		if(ve[i].mac != nil)
-			print("-m %s ", ve[i].mac);
+			print("-a %s ", ve[i].mac);
 	}
 	print("-r %s -u %s\n", localroot, username);