Use sh instead of bash when installing grub

pshchelo · pshchelo · commit a5370d52cdc2 · 2017-01-17T13:57:49.000+02:00
there is no guarantee that 'bash' is present in a user's image,
while 'sh' as system shell must be there.
As we do not use any bash-specific syntax (just starting commands in a
subshell) when installing the bootloader from chroot-ed user image,
let's be more supportive and use 'sh' instead of 'bash' for that.

Change-Id: I1fb82068b9c55da35166d8d2ecf9f0ba41356adb
Closes-Bug: #1657096
diff --git a/ironic_python_agent/extensions/image.py b/ironic_python_agent/extensions/image.py
@@ -114,7 +114,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})
@@ -127,13 +127,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,
diff --git a/ironic_python_agent/tests/unit/extensions/test_image.py b/ironic_python_agent/tests/unit/extensions/test_image.py
@@ -88,11 +88,11 @@ def test__install_grub2(self, mock_get_part_uuid, environ_mock,
                               self.fake_dir + '/proc'),
                     mock.call('mount', '-t', 'sysfs', 'none',
                               self.fake_dir + '/sys'),
-                    mock.call(('chroot %s /bin/bash -c '
+                    mock.call(('chroot %s /bin/sh -c '
                               '"/usr/sbin/grub-install %s"' %
                                (self.fake_dir, self.fake_dev)), shell=True,
                               env_variables={'PATH': '/sbin:/bin'}),
-                    mock.call(('chroot %s /bin/bash -c '
+                    mock.call(('chroot %s /bin/sh -c '
                                '"/usr/sbin/grub-mkconfig -o '
                                '/boot/grub/grub.cfg"' % self.fake_dir),
                               shell=True,
@@ -133,15 +133,15 @@ def test__install_grub2_uefi(self, mock_get_part_uuid, mkdir_mock,
                               self.fake_dir + '/sys'),
                     mock.call('mount', self.fake_efi_system_part,
                               self.fake_dir + '/boot/efi'),
-                    mock.call(('chroot %s /bin/bash -c '
+                    mock.call(('chroot %s /bin/sh -c '
                               '"/usr/sbin/grub-install %s"' %
                                (self.fake_dir, self.fake_dev)), shell=True,
                               env_variables={'PATH': '/sbin:/bin'}),
-                    mock.call(('chroot %s /bin/bash -c '
+                    mock.call(('chroot %s /bin/sh -c '
                               '"/usr/sbin/grub-install %s --removable"' %
                                (self.fake_dir, self.fake_dev)), shell=True,
                               env_variables={'PATH': '/sbin:/bin'}),
-                    mock.call(('chroot %s /bin/bash -c '
+                    mock.call(('chroot %s /bin/sh -c '
                                '"/usr/sbin/grub-mkconfig -o '
                                '/boot/grub/grub.cfg"' % self.fake_dir),
                               shell=True,
@@ -193,15 +193,15 @@ def umount_raise_func(*args, **kwargs):
                               self.fake_dir + '/sys'),
                     mock.call('mount', self.fake_efi_system_part,
                               self.fake_dir + '/boot/efi'),
-                    mock.call(('chroot %s /bin/bash -c '
+                    mock.call(('chroot %s /bin/sh -c '
                               '"/usr/sbin/grub-install %s"' %
                                (self.fake_dir, self.fake_dev)), shell=True,
                               env_variables={'PATH': '/sbin:/bin'}),
-                    mock.call(('chroot %s /bin/bash -c '
+                    mock.call(('chroot %s /bin/sh -c '
                               '"/usr/sbin/grub-install %s --removable"' %
                                (self.fake_dir, self.fake_dev)), shell=True,
                               env_variables={'PATH': '/sbin:/bin'}),
-                    mock.call(('chroot %s /bin/bash -c '
+                    mock.call(('chroot %s /bin/sh -c '
                                '"/usr/sbin/grub-mkconfig -o '
                                '/boot/grub/grub.cfg"' % self.fake_dir),
                               shell=True,
diff --git a/releasenotes/notes/no-bash-for-grub-c38369af8cc7cf26.yaml b/releasenotes/notes/no-bash-for-grub-c38369af8cc7cf26.yaml
@@ -0,0 +1,6 @@
+---
+fixes:
+  - |
+    Ironic Python Agent no longer requires 'bash' to be present in the user
+    image when preparing the partition image for local boot,
+    and uses default 'sh' interpreter to run 'grub'-related commands instead.
