Skip to content

Commit c6e0dff

Browse files
committed
Fix path for restorecon
On RHEL6 restorecon is in /sbin and on newer RHEL based systems it is in /usr/sbin Closes-Bug: rhbz#1109079 Change-Id: I5662c4337ff23310c12a86834c51c6a3ec151a1f
1 parent 6d35b1e commit c6e0dff

File tree

2 files changed

+2
-2
lines changed

2 files changed

+2
-2
lines changed

manifests/storage/mount.pp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@
6565
if ($::selinux == 'true') {
6666
exec { "restorecon_mount_${name}":
6767
command => "restorecon ${mnt_base_dir}/${name}",
68-
path => ['/usr/sbin', '/bin'],
68+
path => ['/usr/sbin', '/sbin'],
6969
subscribe => Exec["mount_${name}"],
7070
before => Exec["fix_mount_permissions_${name}"],
7171
refreshonly => true,

spec/defines/swift_storage_mount_spec.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@
5454

5555
it { should contain_exec("restorecon_mount_dans_mount_point").with(
5656
{:command => "restorecon /srv/node/dans_mount_point",
57-
:path => ['/usr/sbin', '/bin'],
57+
:path => ['/usr/sbin', '/sbin'],
5858
:refreshonly => true}
5959
)}
6060

0 commit comments

Comments
 (0)