From dc35303b4554c9e3121af02e12afbafa6b04e9b2 Mon Sep 17 00:00:00 2001 From: Michael Prokop Date: Wed, 18 May 2011 18:05:53 +0000 Subject: [PATCH] Fix logic when pro edition is being used. From: Michael Prokop --- deployment.sh | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/deployment.sh b/deployment.sh index d1a9718..dc4581c 100755 --- a/deployment.sh +++ b/deployment.sh @@ -105,6 +105,15 @@ if dmidecode| grep -q 'Location In Chassis'; then PRO_EDITION=true fi +if checkBootParam ngcpinst || checkBootParam ngcpsp1 || checkBootParam ngcpsp2 || \ + checkBootParam ngcppro ; then + NGCP_INSTALLER=true +fi + +if checkBootParam ngcppro || checkBootParam ngcpsp1 || checkBootParam ngcpsp2 ; then + PRO_EDITION=true +fi + if "$PRO_EDITION" ; then ROLE=sp1 @@ -118,11 +127,6 @@ if checkBootParam nongcp ; then NGCP_INSTALLER=false fi -if checkBootParam ngcpinst || checkBootParam ngcpsp1 || checkBootParam ngcpsp2 || \ - checkBootParam ngcppro ; then - NGCP_INSTALLER=true -fi - # configure static network in installed system? if checkBootParam ngcpnw.dhcp ; then export DHCP=true