nofork is -f now - vx32 - Local 9vx git repository for patches.
(DIR) Log
(DIR) Files
(DIR) Refs
---
(DIR) commit 0a4fdbbab34c9131ae7b05c2920fc41837b99a55
(DIR) parent 22f9c849f452516af8e9af87ef48461002501fc3
(HTM) Author: Jesus Galan Lopez (yiyus) <yiyu.jgl@gmail.com>
Date: Tue, 15 Jun 2010 20:38:04 +0200
nofork is -f now
Diffstat:
src/9vx/9vx-tap | 4 ++--
src/9vx/main.c | 18 ++++++++++--------
2 files changed, 12 insertions(+), 10 deletions(-)
---
(DIR) diff --git a/src/9vx/9vx-tap b/src/9vx/9vx-tap
@@ -14,8 +14,8 @@ sudo /sbin/ifconfig $IFACE 0.0.0.0 up
# Add it to the bridge
sudo /usr/sbin/brctl addif br0 $IFACE
-# Launch 9vx (use -F to not fork)
-9vx -F -n tap $IFACE $*
+# Launch 9vx (use -f to not fork)
+9vx -f -n tap $IFACE $*
# Bring the tap device down and disconnect from br0
sudo /sbin/ifconfig $IFACE down
(DIR) diff --git a/src/9vx/main.c b/src/9vx/main.c
@@ -60,6 +60,7 @@ static char* inifile;
static char inibuf[BOOTARGSLEN];
static char *iniline[MAXCONF];
static int bootboot; /* run /boot/boot instead of bootscript */
+static int nofork; /* do not fork at init */
static int initrc; /* run rc instead of init */
static int nogui; /* do not start the gui */
static int usetty; /* use tty for input/output */
@@ -87,7 +88,7 @@ void
usage(void)
{
// TODO(yy): add debug and other options by ron
- fprint(2, "usage: 9vx [-p file.ini] [-bgit] [-n [tap] [netdev]] [-m macaddr] [-r root] [-u user]\n");
+ fprint(2, "usage: 9vx [-p file.ini] [-bfgit] [-n [tap] [netdev]] [-m macaddr] [-r root] [-u user]\n");
exit(1);
}
@@ -99,7 +100,6 @@ nop(void)
int
main(int argc, char **argv)
{
- int nofork;
int vetap;
char *vedev;
char buf[1024];
@@ -128,9 +128,6 @@ main(int argc, char **argv)
case 'K':
tracekdev++;
break;
- case 'F':
- nofork = 1;
- break;
case 'M':
tracemmu++;
break;
@@ -151,6 +148,9 @@ main(int argc, char **argv)
case 'b':
bootboot = 1;
break;
+ case 'f':
+ nofork = 1;
+ break;
case 'g':
nogui = 1;
usetty = 1;
@@ -244,9 +244,9 @@ main(int argc, char **argv)
print("9vx ");
if(inifile)
print("-p %s ", inifile);
- if(bootboot | nogui | initrc | usetty)
- print("-%s%s%s%s ", bootboot ? "b" : "", nogui ? "g" : "",
- initrc ? "i " : "", usetty ? "t " : "");
+ if(bootboot | nofork | nogui | initrc | usetty)
+ print("-%s%s%s%s%s ", bootboot ? "b" : "", nofork ? "f " : "",
+ nogui ? "g" : "", initrc ? "i " : "", usetty ? "t " : "");
for(int i=0; i<nve; i++){
print("-n %s", ve[i].tap ? "tap ": "");
if(ve[i].dev != nil)
@@ -395,6 +395,8 @@ iniopt(char *name, char *value)
bootboot = 1;
else if(strcmp(name, "initrc") == 0)
initrc = 1;
+ else if(strcmp(name, "nofork") == 0)
+ nofork = 1;
else if(strcmp(name, "localroot") == 0 && !localroot)
localroot = value;
else if(strcmp(name, "user") == 0 && !username)