Merge pull request #389 from SUSE/bsc1250078

bind mount only required subdirectories under /run into chroot

Author: schaefi

suse_migration_services/units/mount_system.py

@@ -179,9 +179,20 @@ def mount_system(root_path, fstab):
             system_mount.add_entry(
                 mount_type, mount_point
             )
-        log.info('Bind mount /run inside chroot {0}'.format(root_path))
+        log.info('Bind mount subdirectories from /run inside chroot {0}'.format(root_path))
+        os.makedirs(os.sep.join([root_path, 'run', 'NetworkManager']), exist_ok=True)
         Command.run(
-            ['mount', '-o', 'bind', '/run', os.sep.join([root_path, 'run'])]
+            [
+                'mount', '-o', 'bind', '/run/NetworkManager',
+                os.sep.join([root_path, 'run', 'NetworkManager'])
+            ]
+        )
+        os.makedirs(os.sep.join([root_path, 'run', 'netconfig']), exist_ok=True)
+        Command.run(
+            [
+                'mount', '-o', 'bind', '/run/netconfig',
+                os.sep.join([root_path, 'run', 'netconfig'])
+            ]
         )
     except Exception as issue:
         log.error(

test/unit/units/mount_system_test.py

@@ -105,8 +105,9 @@ def command_calls(command):
     @patch('suse_migration_services.units.mount_system.is_mounted')
     @patch('os.path.isfile')
     @patch('os.path.exists')
+    @patch('os.makedirs')
     def test_main(
-        self, mock_path_exists, mock_path_isfile, mock_is_mounted, mock_Fstab,
+        self, mock_makedirs, mock_path_exists, mock_path_isfile, mock_is_mounted, mock_Fstab,
         mock_path_wipe, mock_Command_run, mock_update_migration_config_file,
         mock_get_migration_config_file,
         mock_get_system_migration_custom_config_file, mock_yaml_dump,
@@ -203,7 +204,16 @@ def _is_mounted(path):
                     ['mount', '-t', 'sysfs', 'sysfs', '/system-root/sys']
                 ),
                 call(
-                    ['mount', '-o', 'bind', '/run', '/system-root/run']
+                    [
+                        'mount', '-o', 'bind', '/run/NetworkManager',
+                        '/system-root/run/NetworkManager'
+                    ]
+                ),
+                call(
+                    [
+                        'mount', '-o', 'bind', '/run/netconfig',
+                        '/system-root/run/netconfig'
+                    ]
                 )
             ]
             assert fstab_mock.add_entry.call_args_list == [
@@ -253,6 +263,10 @@ def _is_mounted(path):
                     'sysfs', '/system-root/sys'
                 )
             ]
+            assert mock_makedirs.call_args_list == [
+                call('/system-root/run/NetworkManager', exist_ok=True),
+                call('/system-root/run/netconfig', exist_ok=True)
+            ]
             fstab_mock.export.assert_called_once_with(
                 '/etc/system-root.fstab'
             )