From bee7e14e775297d76e447eb70889967261a12949 Mon Sep 17 00:00:00 2001 From: Peng Zhihui Date: Mon, 28 Apr 2014 09:27:16 +0800 Subject: [PATCH] Correct getting instmode modified: interface/ri_inst_cli.py modified: operation/finish_install/98state_grid_custom.py --- interface/ri_inst_cli.py | 5 ++++- operation/finish_install/98state_grid_custom.py | 5 ++++- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/interface/ri_inst_cli.py b/interface/ri_inst_cli.py index 7785290..1131454 100644 --- a/interface/ri_inst_cli.py +++ b/interface/ri_inst_cli.py @@ -36,7 +36,10 @@ def set_task_over(): # if re.match('instmode=',i): # instmode = i.split('=')[1] # break - instmode = os.environ["instmode"] + try: + instmode = os.environ["instmode"] + except: + instmode = 'Text' screen = SnackScreen() screen.drawRootText(0, 0, 'Rocky Security OS Install') screen.pushHelpLine(' ') diff --git a/operation/finish_install/98state_grid_custom.py b/operation/finish_install/98state_grid_custom.py index 6c1a200..4c826d9 100755 --- a/operation/finish_install/98state_grid_custom.py +++ b/operation/finish_install/98state_grid_custom.py @@ -21,7 +21,10 @@ shell = ri_data.StateGrid.shell # if re.match('instmode=',i): # instmode = i.split('=')[1] # break -instmode = os.environ["instmode"] +try: + instmode = os.environ["instmode"] +except: + instmode = 'Text' if instmode == 'StateGrid': os.system("cp -r /usr/lib/StateGrid /mnt/opt/") os.system("chroot /mnt /opt/StateGrid/setup.sh %s %s %s" %(username, homedir, shell))