x/bareon
Code Issues Proposed changes

Merge "Set GRUB_HIDDEN_TIMEOUT=5 in /etc/default/grub"

Browse Source
This commit is contained in:
Jenkins 2014-12-04 21:35:12 +00:00 committed by Gerrit Code Review
commit e808d85431
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
fuel_agent/utils/grub_utils.py
View File

@ -199,13 +199,16 @@ def grub2_install(install_devices, chroot=''):
def grub2_cfg(kernel_params='', chroot=''): def grub2_cfg(kernel_params='', chroot=''):
grub_defaults = chroot + guess_grub2_default(chroot=chroot) grub_defaults = chroot + guess_grub2_default(chroot=chroot)
regex = re.compile(r'^.*GRUB_CMDLINE_LINUX.*') rekerparams = re.compile(r'^.*GRUB_CMDLINE_LINUX=.*')
retimeout = re.compile(r'^.*GRUB_HIDDEN_TIMEOUT=.*')
new_content = '' new_content = ''
with open(grub_defaults) as f: with open(grub_defaults) as f:
for line in f: for line in f:
new_content += regex.sub( line = rekerparams.sub(
'GRUB_CMDLINE_LINUX="{kernel_params}"'. 'GRUB_CMDLINE_LINUX="{kernel_params}"'.
format(kernel_params=kernel_params), line) format(kernel_params=kernel_params), line)
line = retimeout.sub('GRUB_HIDDEN_TIMEOUT=5', line)
new_content += line
with open(grub_defaults, 'wb') as f: with open(grub_defaults, 'wb') as f:
f.write(new_content) f.write(new_content)
cmd = [guess_grub2_mkconfig(chroot), '-o', guess_grub2_conf(chroot)] cmd = [guess_grub2_mkconfig(chroot), '-o', guess_grub2_conf(chroot)]