From dda0659b716396e4da9e671623039a66200a37a6 Mon Sep 17 00:00:00 2001
From: Lans Zhang <jia.zhang@windriver.com>
Date: Tue, 4 Jul 2017 17:20:07 +0800
Subject: init.ima: code style cleanup

Signed-off-by: Lans Zhang <jia.zhang@windriver.com>
---
 .../recipes-core/initrdscripts/files/init.ima      | 22 ++++++++--------------
 1 file changed, 8 insertions(+), 14 deletions(-)

diff --git a/meta-integrity/recipes-core/initrdscripts/files/init.ima b/meta-integrity/recipes-core/initrdscripts/files/init.ima
index 1e92ba2..fce7eae 100755
--- a/meta-integrity/recipes-core/initrdscripts/files/init.ima
+++ b/meta-integrity/recipes-core/initrdscripts/files/init.ima
@@ -30,43 +30,37 @@ IMA_POLICY=/etc/ima_policy
 
 SECURITYFS_MOUNTED=0
 
-function print_critical
-{
+print_critical() {
     printf "\033[1;35m"
     echo "$@"
     printf "\033[0m"
 }
 
-function print_error
-{
+print_error() {
     printf "\033[1;31m"
     echo "$@"
     printf "\033[0m"
 }
 
-function print_warning
-{
+print_warning() {
     printf "\033[1;33m"
     echo "$@"
     printf "\033[0m"
 }
 
-function print_info
-{
+print_info() {
     printf "\033[1;32m"
     echo "$@"
     printf "\033[0m"
 }
 
-function print_verbose
-{
+print_verbose() {
     printf "\033[1;36m"
     echo "$@"
     printf "\033[0m"
 }
 
-function trap_handler
-{
+trap_handler() {
     local err=$?
 
     print_verbose "Cleaning up with exit code $err ..."
@@ -103,7 +97,7 @@ fi
 
 keyring_id=0x`grep '\skeyring\s*\.ima: ' "${ROOT_DIR}/proc/keys" | awk '{ print $1 }'`
 
-for key in ${ROOT_DIR}/etc/keys/x509_evm*.pem; do
+for key in ${ROOT_DIR}/etc/keys/x509_evm*.crt; do
     [ ! -s "$key" ] && continue
 
     if ! evmctl import "$key" "$keyring_id" >"${ROOT_DIR}/dev/null"; then
@@ -121,7 +115,7 @@ done
     exit 4
 }
 
-cat "${IMA_POLICY}" > "$securityfs_dir/ima/policy" && {
+echo "${IMA_POLICY}" > "$securityfs_dir/ima/policy" && {
     exit 0
 } || {
     print_critical "Unable to load the IMA policy ${IMA_POLICY}"
-- 
cgit v1.2.3-54-g00ecf