summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBill Peck <bpeck@redhat.com>2011-02-02 10:16:05 -0500
committerBill Peck <bpeck@redhat.com>2011-02-02 10:16:05 -0500
commite0ab2b403edc8f214aba37564687caec7ef200e1 (patch)
tree7067244211402fc7f79b23254d236a1bf3c732c5
parentf5ff4ab21d3a60f96cbc6076547bdcd45bff0592 (diff)
When /distribution/install is run check that we are running with correct recipebeaker-distribution-install-1_10-8
and verify the distro requested was put down.
-rwxr-xr-xTasks/distribution/install/default/runtest.sh22
1 files changed, 15 insertions, 7 deletions
diff --git a/Tasks/distribution/install/default/runtest.sh b/Tasks/distribution/install/default/runtest.sh
index 5af0298..5c27ead 100755
--- a/Tasks/distribution/install/default/runtest.sh
+++ b/Tasks/distribution/install/default/runtest.sh
@@ -39,6 +39,19 @@ SetUpInit()
sed -i s/BOOTUP=color/BOOTUP=serial/ /etc/sysconfig/init
}
+CHECKRECIPE()
+{
+ if [ -e "RECIPE.TXT" ]; then
+ # If RECIPE.TXT exists then verify that its our recipe id, otherwise abort.
+ EXISTINGID=$(cat RECIPE.TXT)
+ if [ "$RECIPEID" != "$(cat RECIPE.TXT)" ]; then
+ rhts-abort -t RECIPESET
+ fi
+ else
+ echo $RECIPEID > RECIPE.TXT
+ fi
+}
+
MOTD()
{
FILE=/etc/motd
@@ -65,13 +78,6 @@ SYSLOGLVL()
/sbin/service syslog restart
}
-KA()
-{
- wget http://jenner.boston.redhat.com/ka/ka-client.noarch.rpm
- rpm -i ka-client.noarch.rpm
- /usr/share/ka-client/bin/ka-results
-}
-
SysReport ()
{
OUTPUTFILE=`mktemp /tmp/tmp.XXXXXX`
@@ -257,6 +263,8 @@ echo "***** Start of Install test *****" > $OUTPUTFILE
FILEAREA=/mnt/testarea
/bin/dmesg > $FILEAREA/boot.messages
+CHECKRECIPE
+
MOTD
SetUpInit