diff options
| -rwxr-xr-x | sys/src/9/boot/bootrc | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/sys/src/9/boot/bootrc b/sys/src/9/boot/bootrc index e4d45635b..8e525fb11 100755 --- a/sys/src/9/boot/bootrc +++ b/sys/src/9/boot/bootrc @@ -88,8 +88,6 @@ fn main{ } if not x=($x -u) - if(! ~ $#auth 0) - x=($x -a $auth) if(! ~ $#debugfactotum 0) x=($x -p) must $x @@ -98,9 +96,11 @@ fn main{ # config method $mp(1) $ma - # load keys from secstore - if(~ $#auth 1 && test -x /bin/auth/secstore && test -f /mnt/factotum/ctl){ - x=(auth/secstore -G factotum -s $auth) + # load keys from secstore if $auth or $secstore is not empty + x=secstore + 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(~ $service cpu) $x -n >/mnt/factotum/ctl if(~ $status *readnvram* || ! ~ $service cpu) |