diff options
| author | Jenkins <jenkins@review.openstack.org> | 2017-01-18 10:27:56 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2017-01-18 10:27:56 +0000 |
| commit | 7680625994093f39fa9eec8aa2d8c17c35f44e81 (patch) | |
| tree | 94d233d5f22d2977e1930e5206e323ba203296d8 /ironic_python_agent/extensions/image.py | |
| parent | 9ffda55b4a5a8dd5413456149f9adbf853b8a307 (diff) | |
| parent | a5370d52cdc25573f4c7935f5bcde784814689f3 (diff) | |
| download | ironic-python-agent-7680625994093f39fa9eec8aa2d8c17c35f44e81.tar.gz | |
Merge "Use sh instead of bash when installing grub"
Diffstat (limited to 'ironic_python_agent/extensions/image.py')
| -rw-r--r-- | ironic_python_agent/extensions/image.py | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/ironic_python_agent/extensions/image.py b/ironic_python_agent/extensions/image.py index 5d7ce69e..36d8ab9a 100644 --- a/ironic_python_agent/extensions/image.py +++ b/ironic_python_agent/extensions/image.py @@ -112,7 +112,7 @@ def _install_grub2(device, root_uuid, efi_system_part_uuid=None): path_variable = '%s:/bin' % path_variable # Install grub - utils.execute('chroot %(path)s /bin/bash -c ' + utils.execute('chroot %(path)s /bin/sh -c ' '"/usr/sbin/%(bin)s-install %(dev)s"' % {'path': path, 'bin': binary_name, 'dev': device}, shell=True, env_variables={'PATH': path_variable}) @@ -125,13 +125,13 @@ def _install_grub2(device, root_uuid, efi_system_part_uuid=None): # the default file to be copied, destination file name, and # prevents NVRAM from being updated. if efi_partition: - utils.execute('chroot %(path)s /bin/bash -c ' + utils.execute('chroot %(path)s /bin/sh -c ' '"/usr/sbin/%(bin)s-install %(dev)s --removable"' % {'path': path, 'bin': binary_name, 'dev': device}, shell=True, env_variables={'PATH': path_variable}) # Generate the grub configuration file - utils.execute('chroot %(path)s /bin/bash -c ' + utils.execute('chroot %(path)s /bin/sh -c ' '"/usr/sbin/%(bin)s-mkconfig -o ' '/boot/%(bin)s/grub.cfg"' % {'path': path, 'bin': binary_name}, shell=True, |