linx/new_install
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Ext4 supports acl and automated install will restart automately

Browse Source 
modified:   interface/ri_inst_cli.py
	modified:   operation/configure_fstab.sh
This commit is contained in:
Peng Zhihui
2014-02-24 17:27:23 +08:00
parent 0dc4b94744
commit 3236edd370
2 changed files with 14 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
interface/ri_inst_cli.py
View File

@@ -16,6 +16,7 @@
# Ling Fen 2010-09-04 create # Ling Fen 2010-09-04 create
# #
import time
from ri_oper import language, Rate from ri_oper import language, Rate
def set_task(task_name): def set_task(task_name):
print task_name print task_name
@@ -27,9 +28,18 @@ def set_task_scale():
print "%.2f" %float(Rate.value) print "%.2f" %float(Rate.value)
def set_task_over(): def set_task_over():
string = raw_input("Rocky system installation successfully, do you want to reboot?[Y/n]") f = open('/proc/cmdline', 'r')
if string.lower() == "y" or string == "": cmdline = f.readline()
return True 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 return False
def root_destroy(): def root_destroy():

2
operation/configure_fstab.sh
View File

@@ -72,7 +72,7 @@ configure_fstab ()
# dump utility, set root device of fs_passno 1. root device must first check. # dump utility, set root device of fs_passno 1. root device must first check.
# other device set 0. # other device set 0.
case $fs_type in case $fs_type in
ext2|ext3|reiserfs) ext2|ext3|ext4|reiserfs)
[ -z "$fs_mntops" ] && fs_mntops="acl" [ -z "$fs_mntops" ] && fs_mntops="acl"
;; ;;
swap) swap)