xfnw/plan9fox
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

fixed by fuck up

Browse source
This commit is contained in:
Matthew Veety 2015-05-13 00:15:18 -04:00
parent 80845af98b
commit 2b4a488762
2 changed files with 2 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

8
sys/src/9/boot/bootrc
View file

@ -90,9 +90,6 @@ fn main{
} }
if not if not
x=($x -u) x=($x -u)
if(~ $autolog true || ~ $autolog yes || ~ $autolog 1)
if(! ~ $service cpu)
x=($x -T)
if(! ~ $#debugfactotum 0) if(! ~ $#debugfactotum 0)
x=($x -p) x=($x -p)
must $x must $x
@ -106,9 +103,6 @@ fn main{
if(~ $#$x 0) x=auth if(~ $#$x 0) x=auth
if(! ~ $#$x 0 && test -x /bin/auth/secstore && test -f /mnt/factotum/ctl){ if(! ~ $#$x 0 && test -x /bin/auth/secstore && test -f /mnt/factotum/ctl){
x=(auth/secstore -G factotum -s^$$x) x=(auth/secstore -G factotum -s^$$x)
if(~ $autolog true || ~ $autolog yes || ~ $autolog 1)
if(! ~ $service cpu)
x=($x -n)
if(~ $service cpu) if(~ $service cpu)
$x -n >/mnt/factotum/ctl $x -n >/mnt/factotum/ctl
if(~ $status *readnvram* || ! ~ $service cpu) if(~ $status *readnvram* || ! ~ $service cpu)
@ -123,7 +117,7 @@ fn main{
if(~ $#bootdisk 1 && ~ $#cfs 0) if(~ $#bootdisk 1 && ~ $#cfs 0)
cfs=$bootdisk/cache cfs=$bootdisk/cache
if(~ $#cfs 1 && ! ~ $cfs off && test -f $cfs){ if(~ $#cfs 1 && ! ~ $cfs off && test -f $cfs){
x=(/bin/cfs -S -s -f $cfs) x=(/bin/cfs -s -f $cfs)
if(~ -f $ff) if(~ -f $ff)
x=($x -r) x=($x -r)
{$x </srv/boot &} | echo 0 >/srv/cfs {$x </srv/boot &} | echo 0 >/srv/cfs

9
sys/src/cmd/auth/factotum/fs.c
View file

@ -64,18 +64,12 @@ main(int argc, char **argv)
Dir d; Dir d;
Proto *p; Proto *p;
askforkeys = 1;
trysecstore = 1; trysecstore = 1;
ARGBEGIN{ ARGBEGIN{
case 'D': case 'D':
chatty9p++; chatty9p++;
break; break;
case 'T':
askforkeys = 1;
trysecstore = 1;
sflag = 1;
break;
case 'S': /* server: read nvram, no prompting for keys */ case 'S': /* server: read nvram, no prompting for keys */
askforkeys = 0; askforkeys = 0;
trysecstore = 0; trysecstore = 0;
@ -185,9 +179,6 @@ main(int argc, char **argv)
if((fd = open(smprint("%s/factotum/ctl", mtpt), OWRITE)) < 0) if((fd = open(smprint("%s/factotum/ctl", mtpt), OWRITE)) < 0)
sysfatal("can't open factotum: %r"); sysfatal("can't open factotum: %r");
dup(fd, 1); dup(fd, 1);
if(sflag)
execl("/bin/auth/secstore", "secstore", "-n", "-G", "factotum", nil);
else
execl("/bin/auth/secstore", "secstore", "-G", "factotum", nil); execl("/bin/auth/secstore", "secstore", "-G", "factotum", nil);
exits(nil); exits(nil);
} }