From a4bcbf4fc624e70e2c433673c42d092b8203a13b Mon Sep 17 00:00:00 2001 From: Peng Zhihui Date: Tue, 8 Apr 2014 17:24:05 +0800 Subject: [PATCH] modified: interface/ri_inst_cli.py modified: operation/finish_install/66install_lib_32.sh modified: operation/finish_install/95state_grid_custom.py --- interface/ri_inst_cli.py | 2 +- operation/finish_install/66install_lib_32.sh | 5 +++++ operation/finish_install/95state_grid_custom.py | 2 +- 3 files changed, 7 insertions(+), 2 deletions(-) diff --git a/interface/ri_inst_cli.py b/interface/ri_inst_cli.py index 21155bc..a13b5b5 100644 --- a/interface/ri_inst_cli.py +++ b/interface/ri_inst_cli.py @@ -30,7 +30,7 @@ def set_task_scale(): def set_task_over(): f = open('/proc/cmdline', 'r') - cmdline = f.readline() + cmdline = f.readline().strip() f.close() #instmode = cmdline.split(' ')[0].split('=')[1] for i in cmdline.split(' '): diff --git a/operation/finish_install/66install_lib_32.sh b/operation/finish_install/66install_lib_32.sh index cf30a5a..9d1cf67 100755 --- a/operation/finish_install/66install_lib_32.sh +++ b/operation/finish_install/66install_lib_32.sh @@ -20,6 +20,11 @@ #set -o nounset # Treat unset variables as an error +if [ "$(uname -m)" = "i686" ];then + echo "i686 OS doesn't install 32lib pkgs" + exit 0 +fi + source ./functions mkdir -p $TARGET/pkg_lib_i686 diff --git a/operation/finish_install/95state_grid_custom.py b/operation/finish_install/95state_grid_custom.py index 31738fc..cfa7ae3 100755 --- a/operation/finish_install/95state_grid_custom.py +++ b/operation/finish_install/95state_grid_custom.py @@ -15,7 +15,7 @@ shell = ri_data.StateGrid.shell # run state grid custom scripts f = open('/proc/cmdline', 'r') -cmdline = f.readline() +cmdline = f.readline().strip() f.close() #instmode = cmdline.split(' ')[0].split('=')[1] for i in cmdline.split(' '):