On Wed, 2019-06-12 at 16:08 -0700, Alison Schofield wrote:
> Fix a typo in security.sh that causes a script failure
> when an nvdimm-master.blob already exists and needs to
> be backed up.
> 
> + setup_keys
> + '[' '!' -d /etc/ndctl/keys ']'
> + '[' -f /etc/ndctl/keys/nvdimm-master.blob ']'
> + mv /etc/ndctl/keys/nvdimm-master.blob /etc/ndctl/keys/nvdimm-
> master.blob.bak
> + 0=1
> ./security.sh: line 39: 0=1: command not found
> 
> Fixes: ba35642d3815 ("ndctl: add a load-keys test in the security unit
> test")
> Signed-off-by: Alison Schofield <[email protected]>
> ---
>  test/security.sh | 4 ++--
>  1 file changed, 2 insertions(+), 2 deletions(-)

Looks good, I'll pick it up for v66 and push it out to pending shortly.

> 
> diff --git a/test/security.sh b/test/security.sh
> index 8a36265..c86d2c6 100755
> --- a/test/security.sh
> +++ b/test/security.sh
> @@ -36,11 +36,11 @@ setup_keys()
>  
>       if [ -f "$masterpath" ]; then
>               mv "$masterpath" "$masterpath.bak"
> -             $backup_key=1
> +             backup_key=1
>       fi
>       if [ -f "$keypath/tpm.handle" ]; then
>               mv "$keypath/tpm.handle" "$keypath/tmp.handle.bak"
> -             $backup_handle=1
> +             backup_handle=1
>       fi
>  
>       dd if=/dev/urandom bs=1 count=32 2>/dev/null | keyctl padd user
> "$masterkey" @u

_______________________________________________
Linux-nvdimm mailing list
[email protected]
https://lists.01.org/mailman/listinfo/linux-nvdimm

Reply via email to