[rhel5-branch] Use DISPATCH_NOOP if we go back to the doReIPL step (#654685)

[Martin Gracik]

On s390 and s390x architectures the doReIPL function should
return DISPATCH_NOOP if we go back, otherwise we can't get
from the network step back to the bootloader.
---
 packages.py |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)

diff --git a/packages.py b/packages.py
index a1a6e56..3a9fd88 100644
--- a/packages.py
+++ b/packages.py
@@ -411,7 +411,8 @@ def selectLanguageSupportGroups(grpset, instLanguage):
         grpset.groups["language-support"].select()

def doReIPL(anaconda):
-    if not rhpl.getArch() in ['s390', 's390x']:
+    if (not rhpl.getArch() in ['s390', 's390x'] or
+        anaconda.dir == DISPATCH_BACK):
         return DISPATCH_NOOP

messageInfo = iutil.reIPL(anaconda, os.getppid())

[Brian C. Lane]

On Mon, Feb 28, 2011 at 09:28:04PM +0100, Martin Gracik wrote:
> On s390 and s390x architectures the doReIPL function should
> return DISPATCH_NOOP if we go back, otherwise we can't get
> from the network step back to the bootloader.
>
> packages.py |    3 ++-
>  1 files changed, 2 insertions(+), 1 deletions(-)
>
> diff --git a/packages.py b/packages.py
> index a1a6e56..3a9fd88 100644
> --- a/packages.py
> +++ b/packages.py
> @@ -411,7 +411,8 @@ def selectLanguageSupportGroups(grpset, instLanguage):
>          grpset.groups["language-support"].select()
>
> def doReIPL(anaconda):
> if not rhpl.getArch() in ['s390', 's390x']:
>
> if (not rhpl.getArch() in ['s390', 's390x'] or
>    anaconda.dir == DISPATCH_BACK):
>    return DISPATCH_NOOP
>
> messageInfo = iutil.reIPL(anaconda, os.getppid())

Ack