Skip to content
This repository has been archived by the owner on Nov 6, 2020. It is now read-only.

Commit

Permalink
Use the correct path for findmnt on Fedora.
Browse files Browse the repository at this point in the history
This patch is dedicated to Gilles who didn't like the findmnt patch
initially, but now loves it because it is cross distro friendly :)
Thanks for all your time testing Puppet-Gluster... More eyes helps!
  • Loading branch information
purpleidea committed May 7, 2014
1 parent 8f47a9b commit 0c9109d
Show file tree
Hide file tree
Showing 3 changed files with 3 additions and 1 deletion.
1 change: 1 addition & 0 deletions data/tree/RedHat/Fedora.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@ gluster::params::program_vgdisplay: '/usr/sbin/vgdisplay'
#gluster::params::program_lvdisplay: '/usr/sbin/lvdisplay'
gluster::params::program_mkfs_xfs: '/usr/sbin/mkfs.xfs'
gluster::params::program_mkfs_ext4: '/usr/sbin/mkfs.ext4'
gluster::params::program_findmnt: '/usr/bin/findmnt'
gluster::params::misc_gluster_reload: '/usr/bin/systemctl reload glusterd'

# vim: ts=8
2 changes: 1 addition & 1 deletion manifests/brick.pp
Original file line number Diff line number Diff line change
Expand Up @@ -467,7 +467,7 @@
onlyif => "/usr/bin/test -n '${valid_fsuuid}'",
unless => [ # if one element is true, this *doesn't* run
"/usr/bin/test -e /dev/disk/by-uuid/${valid_fsuuid}",
"/bin/findmnt --output 'TARGET,SOURCE' -t ${valid_fstype} --target '${valid_path}' -n",
"${::gluster::params::program_findmnt} --output 'TARGET,SOURCE' -t ${valid_fstype} --target '${valid_path}' -n",
'/bin/false', # TODO: add more criteria
],
require => $exec_requires,
Expand Down
1 change: 1 addition & 0 deletions manifests/params.pp
Original file line number Diff line number Diff line change
Expand Up @@ -49,6 +49,7 @@
$program_mkfs_ext4 = '/sbin/mkfs.ext4',

$program_fping = '/usr/sbin/fping',
$program_findmnt = '/bin/findmnt',

# services...
$service_glusterd = 'glusterd',
Expand Down

0 comments on commit 0c9109d

Please sign in to comment.