summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBill Peck <bpeck@redhat.com>2015-09-18 14:08:06 -0400
committerBill Peck <bpeck@redhat.com>2015-09-18 14:08:06 -0400
commitdcd010af9d93281b46144ec496a6d8127db5f2ff (patch)
tree08d7242fcf13042c5050147ebb4840ffea530b95
parent4e251448551c3d6d941434d9dbbc73779f672a31 (diff)
downloadtests-dcd010af9d93281b46144ec496a6d8127db5f2ff.tar.gz
tests-dcd010af9d93281b46144ec496a6d8127db5f2ff.tar.xz
tests-dcd010af9d93281b46144ec496a6d8127db5f2ff.zip
Update logic when trying to determine redhat vs fedora
-rw-r--r--firmware/amd_seattle/metadata2
-rwxr-xr-xfirmware/amd_seattle/upBIOS6
2 files changed, 5 insertions, 3 deletions
diff --git a/firmware/amd_seattle/metadata b/firmware/amd_seattle/metadata
index b41e9a2..0829789 100644
--- a/firmware/amd_seattle/metadata
+++ b/firmware/amd_seattle/metadata
@@ -1,5 +1,5 @@
[General]
-name=/firmware/update/amd_seattle
+name=/firmware/amd_seattle
owner=Bill Peck <bpeck@redhat.com>
description=Used to automatically upgrade firmware on amd seattle systems
license=GPLv2
diff --git a/firmware/amd_seattle/upBIOS b/firmware/amd_seattle/upBIOS
index d782cb5..a2d7b4e 100755
--- a/firmware/amd_seattle/upBIOS
+++ b/firmware/amd_seattle/upBIOS
@@ -65,7 +65,9 @@ then
fi
-grep -i red $osrel > /dev/null 2>&1
+. $osrel
+
+echo $ID | grep -i rhel > /dev/null 2>&1
status=$?
if [ $status -eq 0 ]
@@ -74,7 +76,7 @@ then
grub="FS0:\EFI\redhat\grubaa64.efi"
fi
-grep -i fedora $osrel > /dev/null 2>&1
+echo $ID | grep -i fedora > /dev/null 2>&1
status=$?
if [ $status -eq 0 ]
then