diff options
| author | Jenkins <jenkins@review.openstack.org> | 2012-08-01 16:24:42 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2012-08-01 16:24:42 +0000 |
| commit | 3a5ea16bec06fceddfe06af343ee505cfc419a1b (patch) | |
| tree | 9ff217b71eb7537db93907863a0a402907f0a1ec | |
| parent | a1834b70461a961dbe5adfe5aa54a555c9a0bda0 (diff) | |
| parent | 95b7569bbb5d99d68c330fa2ca4c27a2147a5c96 (diff) | |
| download | nova-3a5ea16bec06fceddfe06af343ee505cfc419a1b.tar.gz nova-3a5ea16bec06fceddfe06af343ee505cfc419a1b.tar.xz nova-3a5ea16bec06fceddfe06af343ee505cfc419a1b.zip | |
Merge "Revert "Check for selinux before setting up selinux.""
| -rw-r--r-- | nova/virt/disk/api.py | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/nova/virt/disk/api.py b/nova/virt/disk/api.py index af14e3ffc..e55b54fa1 100644 --- a/nova/virt/disk/api.py +++ b/nova/virt/disk/api.py @@ -416,9 +416,7 @@ def _inject_key_into_fs(key, fs): _inject_file_into_fs(fs, keyfile, key_data, append=True) - selinuxdir = _join_and_check_path_within_fs(fs, 'etc', 'selinux') - if os.path.exists(selinuxdir): - _setup_selinux_for_keys(fs) + _setup_selinux_for_keys(fs) def _inject_net_into_fs(net, fs): |