diff options
| author | cinap_lenrek <cinap_lenrek@localhost> | 2011-04-17 10:50:35 +0000 |
|---|---|---|
| committer | cinap_lenrek <cinap_lenrek@localhost> | 2011-04-17 10:50:35 +0000 |
| commit | 65b058830b619bf682c8900a207d2c6b87d2c37e (patch) | |
| tree | 6f3991dd05ff02bfb649a321c1073cf03e0edaf9 /sys | |
| parent | 95758309f394f79ac52a774cd02eb7136346d145 (diff) | |
cwfs: ignore nvram check error
Diffstat (limited to 'sys')
| -rw-r--r-- | sys/src/cmd/cwfs/config.c | 17 |
1 files changed, 8 insertions, 9 deletions
diff --git a/sys/src/cmd/cwfs/config.c b/sys/src/cmd/cwfs/config.c index 49d0ff380..d11944747 100644 --- a/sys/src/cmd/cwfs/config.c +++ b/sys/src/cmd/cwfs/config.c @@ -919,11 +919,14 @@ dodevcopy(void) return 0; } -static void +static int setconfig(char *dev) { - if (dev != nil && !testconfig(dev)) + if (dev && !testconfig(dev)){ nvrsetconfig(dev); /* if it fails, it will complain */ + return 0; + } + return -1; } void @@ -934,14 +937,10 @@ arginit(void) char word[Maxword+1], *cp; Filsys *fs; - if(nvrcheck() == 0) { - setconfig(conf.confdev); - if (!conf.configfirst) - return; - } + nvrcheck(); + if(!setconfig(conf.confdev) && !conf.configfirst) + return; - /* nvr was bad or invoker requested configuration step */ - setconfig(conf.confdev); for (;;) { print("config: "); if ((line = Brdline(&bin, '\n')) == nil) |