From 3236edd370b6ea1186ee2c74237629ae48e7f12b Mon Sep 17 00:00:00 2001 From: Peng Zhihui Date: Mon, 24 Feb 2014 17:27:23 +0800 Subject: [PATCH] Ext4 supports acl and automated install will restart automately modified: interface/ri_inst_cli.py modified: operation/configure_fstab.sh --- interface/ri_inst_cli.py | 16 +++++++++++++--- operation/configure_fstab.sh | 2 +- 2 files changed, 14 insertions(+), 4 deletions(-) diff --git a/interface/ri_inst_cli.py b/interface/ri_inst_cli.py index 62d454a..9643172 100644 --- a/interface/ri_inst_cli.py +++ b/interface/ri_inst_cli.py @@ -16,6 +16,7 @@ # Ling Fen 2010-09-04 create # +import time from ri_oper import language, Rate def set_task(task_name): print task_name @@ -27,9 +28,18 @@ def set_task_scale(): print "%.2f" %float(Rate.value) def set_task_over(): - string = raw_input("Rocky system installation successfully, do you want to reboot?[Y/n]") - if string.lower() == "y" or string == "": - return True + f = open('/proc/cmdline', 'r') + cmdline = f.readline() + f.close() + instmode = cmdline.split(' ')[0].split('=')[1] + if instmode == 'Auto' or instmode == 'StateGrid': + print 'The system will reboot in 10 seconds ......' + time.sleep(10) + return True + else + string = raw_input("Rocky system installation successfully, do you want to reboot?[Y/n]") + if string.lower() == "y" or string == "": + return True return False def root_destroy(): diff --git a/operation/configure_fstab.sh b/operation/configure_fstab.sh index 73458dd..27d1d64 100755 --- a/operation/configure_fstab.sh +++ b/operation/configure_fstab.sh @@ -72,7 +72,7 @@ configure_fstab () # dump utility, set root device of fs_passno 1. root device must first check. # other device set 0. case $fs_type in - ext2|ext3|reiserfs) + ext2|ext3|ext4|reiserfs) [ -z "$fs_mntops" ] && fs_mntops="acl" ;; swap)