ref: 80845af98b8265b13c90cf95eec9274857250859
parent: e8c3eb87d27f95a9a0b89a93164dba42427659ec
author: Matthew Veety <[email protected]>
date: Tue May 12 20:11:59 EDT 2015
removed ukill.
--- a/rc/bin/ukill
+++ /dev/null
@@ -1,12 +1,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}'-}
--- a/sys/src/9/boot/bootrc
+++ b/sys/src/9/boot/bootrc
@@ -90,6 +90,9 @@
}
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 @@
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 @@
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--- a/sys/src/cmd/auth/factotum/fs.c
+++ b/sys/src/cmd/auth/factotum/fs.c
@@ -64,6 +64,7 @@
Dir d;
Proto *p;
+ askforkeys = 1;
trysecstore = 1;
ARGBEGIN{@@ -70,6 +71,11 @@
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 @@
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();