Prevent nusb/disk and nusb/kb from blocking nusbrc

[plan9front.git] / sys / src / 9 / boot / boot.c

diff --git a/sys/src/9/boot/boot.c b/sys/src/9/boot/boot.c
index 655545d4c06cded202a3af21132151d5c142ec50..5ec3118fb0987d6f35d76156ad0e4a609771e009 100644 (file)
--- a/sys/src/9/boot/boot.c
+++ b/sys/src/9/boot/boot.c
@@ -4,14 +4,10 @@
 #include <fcall.h>
 #include "../boot/boot.h"
 
-char   cputype[64];
-int    mflag;
-int    fflag;
-int    kflag;
-
 void
 boot(int argc, char *argv[])
 {
+       char cputype[64];
        char buf[32];
 
        fmtinstall('r', errfmt);
@@ -27,6 +23,7 @@ boot(int argc, char *argv[])
        bind("#ec", "/env", MREPL);
        bind("#e", "/env", MBEFORE|MCREATE);
        bind("#s", "/srv", MREPL|MCREATE);
+       bind("#σ", "/shr", MREPL);
 
        if(Debug){
                int i;
@@ -36,22 +33,10 @@ boot(int argc, char *argv[])
                        print("%lux %s ", (ulong)argv[i], argv[i]);
                print("\n");
        }
-
-       ARGBEGIN{
-       case 'k':
-               kflag = 1;
-               break;
-       case 'm':
-               mflag = 1;
-               break;
-       case 'f':
-               fflag = 1;
-               break;
-       }ARGEND
+       USED(argc);
 
        readfile("#e/cputype", cputype, sizeof(cputype));
        setenv("bootdisk", bootdisk, 0);
-       setenv("cpuflag", cpuflag ? "1" : "0", 0);
 
        /* setup the boot namespace */
        bind("/boot", "/bin", MAFTER);
@@ -60,5 +45,5 @@ boot(int argc, char *argv[])
        snprint(buf, sizeof(buf), "/%s/bin", cputype);
        bind(buf, "/bin", MAFTER);
        bind("/rc/bin", "/bin", MAFTER);
-       execl("/bin/bootrc", "bootrc", nil);
+       exec("/bin/bootrc", argv);
 }