From 4e39b6856b119f55b63fc52d3a3bf1b685c6027c Mon Sep 17 00:00:00 2001
From: Cyrus <24922493+cyrus-dev@users.noreply.github.com>
Date: Fri, 9 Oct 2020 13:18:10 -0400
Subject: [PATCH] post install script was run however that is all that was run.
  The set tcg properties script was not included.  The contents of the new
 script have been added to the post install script and the set tcg script has
 been removed.

---
 HIRS_ProvisionerTPM2/CMakeLists.txt           |  2 --
 .../package/rpm-post-install.sh               | 21 ++++++++++++++++--
 .../package/set_tcg_properties.sh             | 22 -------------------
 3 files changed, 19 insertions(+), 26 deletions(-)
 delete mode 100644 HIRS_ProvisionerTPM2/package/set_tcg_properties.sh

diff --git a/HIRS_ProvisionerTPM2/CMakeLists.txt b/HIRS_ProvisionerTPM2/CMakeLists.txt
index aa8314dd..5b6722d2 100644
--- a/HIRS_ProvisionerTPM2/CMakeLists.txt
+++ b/HIRS_ProvisionerTPM2/CMakeLists.txt
@@ -287,7 +287,6 @@ if (${DISTRIBUTION} STREQUAL "Ubuntu")
     endif()
     set(CPACK_DEBIAN_PACKAGE_ARCHITECTURE amd64)
     set(CPACK_DEBIAN_PACKAGE_CONTROL_EXTRA ${CMAKE_SOURCE_DIR}/package/postinst)
-    set(CPACK_DEBIAN_PACKAGE_SET_TCG ${CMAKE_SOURCE_DIR}/package/set_tcg_properties.sh)
     set(CPACK_PACKAGE_FILE_NAME "${CPACK_DEBIAN_PACKAGE_NAME}_${CPACK_PACKAGE_VERSION}-${CPACK_PACKAGE_RELEASE}_${CPACK_DEBIAN_PACKAGE_ARCHITECTURE}")
 elseif (${DISTRIBUTION} STREQUAL "CentOS Linux")
     # Set variables specific to CPack RPM package generator
@@ -298,7 +297,6 @@ elseif (${DISTRIBUTION} STREQUAL "CentOS Linux")
     set(CPACK_RPM_PACKAGE_GROUP "System Environment/Base")
     set(CPACK_RPM_PACKAGE_REQUIRES "log4cplus >= 1.1.2, tpm2-tss >= 1.0, tpm2-tools >= 1.1.0, protobuf >= 2.4.1, re2 >= 20160401, libcurl >= 7.0.0, paccor, procps-ng >= 3.3.0")
     set(CPACK_RPM_POST_INSTALL_SCRIPT_FILE ${CMAKE_SOURCE_DIR}/package/rpm-post-install.sh)
-    set(CPACK_RPM_POST_INSTALL_TCG_FILE ${CMAKE_SOURCE_DIR}/package/set_tcg_properties.sh)
     set(CPACK_RPM_EXCLUDE_FROM_AUTO_FILELIST_ADDITION /usr/local /usr/local/bin /usr/local/include /usr/local/lib)
     set(CPACK_PACKAGE_FILE_NAME "${CPACK_RPM_PACKAGE_NAME}-${CPACK_PACKAGE_VERSION}-${CPACK_PACKAGE_RELEASE}.${CPACK_RPM_PACKAGE_RELEASE_DIST}.${CMAKE_SYSTEM_PROCESSOR}")
 endif()
diff --git a/HIRS_ProvisionerTPM2/package/rpm-post-install.sh b/HIRS_ProvisionerTPM2/package/rpm-post-install.sh
index 07eaf377..082fd086 100644
--- a/HIRS_ProvisionerTPM2/package/rpm-post-install.sh
+++ b/HIRS_ProvisionerTPM2/package/rpm-post-install.sh
@@ -40,6 +40,23 @@ DEFAULT_SITE_CONFIG_FILE
 fi
 ln -s -f /etc/hirs/provisioner/hirs-provisioner.sh /usr/sbin/hirs-provisioner
 
-if [ ! -f "set_tcg_properties.sh" ]; then
-  sh ./set_tcg_properties.sh
+TCG_BOOT_FILE="/etc/hirs/tcg_boot.properties"
+MAINFEST_DIRECTORY="/boot/tcg/manifest"
+LOG_FILE_LOCATION="$MAINFEST_DIRECTORY/rim/"
+TAG_FILE_LOCATION="$MAINFEST_DIRECTORY/swidtag/"
+
+if [ ! -f "$TCG_BOOT_FILE" ]; then
+  touch "$TCG_BOOT_FILE"
 fi
+
+if [ -d "$LOG_FILE_LOCATION" ]; then
+  RIM_FILE=$(find "$LOG_FILE_LOCATION" -name '*.rimel' -or -name '*.bin' -or -name '*.rimpcr' -or -name '*.log')
+  echo "tcg.rim.file=$RIM_FILE" >> "$TCG_BOOT_FILE"
+fi
+
+if [ -d "$TAG_FILE_LOCATION" ]; then
+  SWID_FILE=$(find "$TAG_FILE_LOCATION" -name '*.swidtag')
+  echo "tcg.swidtag.file=$SWID_FILE" >> "$TCG_BOOT_FILE"
+fi
+
+chmod -w "$TCG_BOOT_FILE"
diff --git a/HIRS_ProvisionerTPM2/package/set_tcg_properties.sh b/HIRS_ProvisionerTPM2/package/set_tcg_properties.sh
deleted file mode 100644
index f36c0561..00000000
--- a/HIRS_ProvisionerTPM2/package/set_tcg_properties.sh
+++ /dev/null
@@ -1,22 +0,0 @@
-#!/bin/bash
-
-TCG_BOOT_FILE="/etc/hirs/tcg_boot.properties"
-MAINFEST_DIRECTORY="/boot/tcg/manifest"
-LOG_FILE_LOCATION="$MAINFEST_DIRECTORY/rim/"
-TAG_FILE_LOCATION="$MAINFEST_DIRECTORY/swidtag/"
-
-if [ ! -f "$TCG_BOOT_FILE" ]; then
-  touch "$TCG_BOOT_FILE"
-fi
-
-if [ -d "$LOG_FILE_LOCATION" ]; then
-  RIM_FILE=$(find "$LOG_FILE_LOCATION" -name '*.rimel' -or -name '*.bin' -or -name '*.rimpcr' -or -name '*.log')
-  echo "tcg.rim.file=$RIM_FILE" >> "$TCG_BOOT_FILE"
-fi
-
-if [ -d "$TAG_FILE_LOCATION" ]; then
-  SWID_FILE=$(find "$TAG_FILE_LOCATION" -name '*.swidtag')
-  echo "tcg.swidtag.file=$SWID_FILE" >> "$TCG_BOOT_FILE"
-fi
-
-chmod -w "$TCG_BOOT_FILE"
\ No newline at end of file