diff options
| author | Matthew Veety <mveety@gmail.com> | 2015-05-13 00:11:59 -0400 |
|---|---|---|
| committer | Matthew Veety <mveety@gmail.com> | 2015-05-13 00:11:59 -0400 |
| commit | 80845af98b8265b13c90cf95eec9274857250859 (patch) | |
| tree | b74b16286193e2a7afbb283310842edba49a0ce3 | |
| parent | e8c3eb87d27f95a9a0b89a93164dba42427659ec (diff) | |
| download | plan9front-80845af98b8265b13c90cf95eec9274857250859.tar.xz | |
removed ukill.
| -rw-r--r-- | rc/bin/ukill | 12 | ||||
| -rwxr-xr-x | sys/src/9/boot/bootrc | 8 | ||||
| -rw-r--r-- | sys/src/cmd/auth/factotum/fs.c | 11 |
3 files changed, 17 insertions, 14 deletions
diff --git a/rc/bin/ukill b/rc/bin/ukill deleted file mode 100644 index f2773bbd5..000000000 --- a/rc/bin/ukill +++ /dev/null @@ -1,12 +0,0 @@ -#!/bin/rc -rfork e -if(~ $#1 0){ - USER=`{cat /dev/user} -} -if not { - USER=$1 -} -PROCS=`{ps | grep $USER | awk '{print $2}'} -for(i in $PROCS){ - echo '@{echo kill>/proc/'^$i^'/note}' -} diff --git a/sys/src/9/boot/bootrc b/sys/src/9/boot/bootrc index 208122f72..3cc4a7fba 100755 --- a/sys/src/9/boot/bootrc +++ b/sys/src/9/boot/bootrc @@ -90,6 +90,9 @@ fn main{ } if not x=($x -u) + if(~ $autolog true || ~ $autolog yes || ~ $autolog 1) + if(! ~ $service cpu) + x=($x -T) if(! ~ $#debugfactotum 0) x=($x -p) must $x @@ -103,6 +106,9 @@ fn main{ if(~ $#$x 0) x=auth if(! ~ $#$x 0 && test -x /bin/auth/secstore && test -f /mnt/factotum/ctl){ x=(auth/secstore -G factotum -s^$$x) + if(~ $autolog true || ~ $autolog yes || ~ $autolog 1) + if(! ~ $service cpu) + x=($x -n) if(~ $service cpu) $x -n >/mnt/factotum/ctl if(~ $status *readnvram* || ! ~ $service cpu) @@ -117,7 +123,7 @@ fn main{ if(~ $#bootdisk 1 && ~ $#cfs 0) cfs=$bootdisk/cache if(~ $#cfs 1 && ! ~ $cfs off && test -f $cfs){ - x=(/bin/cfs -s -f $cfs) + x=(/bin/cfs -S -s -f $cfs) if(~ -f $ff) x=($x -r) {$x </srv/boot &} | echo 0 >/srv/cfs diff --git a/sys/src/cmd/auth/factotum/fs.c b/sys/src/cmd/auth/factotum/fs.c index 7d195ac01..1bde3cfbc 100644 --- a/sys/src/cmd/auth/factotum/fs.c +++ b/sys/src/cmd/auth/factotum/fs.c @@ -64,12 +64,18 @@ main(int argc, char **argv) Dir d; Proto *p; + askforkeys = 1; trysecstore = 1; ARGBEGIN{ case 'D': chatty9p++; break; + case 'T': + askforkeys = 1; + trysecstore = 1; + sflag = 1; + break; case 'S': /* server: read nvram, no prompting for keys */ askforkeys = 0; trysecstore = 0; @@ -179,7 +185,10 @@ main(int argc, char **argv) if((fd = open(smprint("%s/factotum/ctl", mtpt), OWRITE)) < 0) sysfatal("can't open factotum: %r"); dup(fd, 1); - execl("/bin/auth/secstore", "secstore", "-G", "factotum", nil); + if(sflag) + execl("/bin/auth/secstore", "secstore", "-n", "-G", "factotum", nil); + else + execl("/bin/auth/secstore", "secstore", "-G", "factotum", nil); exits(nil); } waitpid(); |