vx32

commit ba0642e03d3ca6ccebf97cbafa392b7f1690f511
parent e00ce4291c4d2dde7b71b0a13cdbdc4c6adf0b01
Author: Jesus Galan Lopez (yiyus) <yiyu.jgl@gmail.com>
Date:   Sat, 18 Sep 2010 16:11:52 +0200

remove -c and document -e cpurc

Diffstat:
M
doc/9vx.1
 | 
17
+++++++----------
M
src/9vx/conf.c
 | 
6
+++---
M
src/9vx/main.c
 | 
8
+-------

3 files changed, 11 insertions(+), 20 deletions(-)
diff --git a/doc/9vx.1 b/doc/9vx.1
@@ -94,11 +94,6 @@ instead of $home/lib/profile.
 Other options are:
 .nr xx \w'\fL-m\f2name\ \ '
 .TP \n(xxu
-.BI -c
-Start as a cpu(1) server (sets
-.I service=cpu
-)
-.TP
 .BI -f
 Do not fork at init
 .TP
@@ -174,13 +169,15 @@ and
 Reboot signals terminate 9vx execution. In particular, the reboot command
 will exit printing its arguments to starndard error.
 .SS Running 9vx as a cpu server
-To run 9vx as a cpu server the
+To run 9vx as a cpu server is recommended to add a
+cpurc file in /cfg/vx32/, see cpurc(8). An example is included
+with 9vx. This file will be used if the
 .I service
-environment variable must be set to
+environment variable is set to
 .I cpu
-, in the 9vx.ini file or with the -c flag. It is recommended to add a
-cpurc in the /cfg/vx32/ directory, see cpurc(8). An example is included
-in the 9vx distribution.
+in the 9vx.ini file (or if the
+.I -e cpurc
+option is given in the command line).
 .SH BUGS
 The pcap ethernet device is not compiled by default (fails without
 pcap.h). To compile it, set PLAN9PCAP to etherpcap in the Makefrag file
diff --git a/src/9vx/conf.c b/src/9vx/conf.c
@@ -180,9 +180,9 @@ printconfig(char *argv0){
 	print(argv0);
 	if(inifile)
 		print(" -p %s", inifile);
-	if(cpuserver | nofork | nogui | initrc | usetty)
-		print(" -%s%s%s%s%s", cpuserver ? "c " : "", nofork ? "f " : "",
-			nogui ? "g" : "",initrc ? "i " : "", usetty ? "t " : "");
+	if(nofork | nogui | initrc | usetty)
+		print(" -%s%s%s%s", nofork ? "f " : "", nogui ? "g" : "",
+			initrc ? "i " : "", usetty ? "t " : "");
 	if(cpulimit != 0)
 		print(" -l %d", cpulimit);
 	if(memmb != 0)
diff --git a/src/9vx/main.c b/src/9vx/main.c
@@ -141,9 +141,6 @@ main(int argc, char **argv)
 	case 'a':
 		setmac(EARGF(usage()));
 		break;
-	case 'c':
-		cpuserver = 1;
-		break;
 	case 'e':
 		initcmd = EARGF(usage());
 		break;
@@ -526,10 +523,7 @@ init0(void)
 	ksetenv("terminal", buf, 0);
 	ksetenv("cputype", "386", 0);
 	ksetenv("rootdir", "/root", 0);
-	if(cpuserver)
-		ksetenv("service", "cpu", 0);
-	else
-		ksetenv("service", "terminal", 0);
+	ksetenv("service", "terminal", 0);
 	ksetenv("user", username, 0);
 	ksetenv("sysname", "vx32", 0);
 	inifields(&inienv);