Skip to content

Commit f212f03

Browse files
author
Joshua Hoblitt
committed
Merge pull request jhoblitt#7 from pecastro/master
Allow usage on more recent Fedora systems.
2 parents f936f90 + afd6ec5 commit f212f03

File tree

1 file changed

+22
-9
lines changed

1 file changed

+22
-9
lines changed

manifests/params.pp

Lines changed: 22 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -3,26 +3,39 @@
33
# This class should be considered private.
44
#
55
class udev::params {
6-
$udev_package = 'udev'
76
$udevadm_path = '/sbin'
87

98
case $::osfamily {
109
'debian': {
10+
$udev_package = 'udev'
1111
$udevlogpriority = 'udevadm control --log-priority'
1212
$udevtrigger = 'udevadm trigger'
1313
}
1414
'redhat': {
15-
case $::operatingsystemmajrelease {
16-
'5': {
17-
$udevtrigger = 'udevtrigger'
18-
$udevlogpriority = 'udevcontrol log_priority'
19-
}
20-
'6','7': {
15+
if $::operatingsystem == 'Fedora' {
16+
if ($::operatingsystemmajrelease >= 20) {
17+
$udev_package = 'systemd'
2118
$udevtrigger = 'udevadm trigger'
2219
$udevlogpriority = 'udevadm control --log-priority'
2320
}
24-
default: {
25-
fail("Module ${module_name} is not supported on RedHat release ${::operatingsystemmajrelease}")
21+
else {
22+
fail("Module ${module_name} might not be supported on Fedora release ${::operatingsystemmajrelease}")
23+
}
24+
} else {
25+
case $::operatingsystemmajrelease {
26+
'5': {
27+
$udev_package = 'udev'
28+
$udevtrigger = 'udevtrigger'
29+
$udevlogpriority = 'udevcontrol log_priority'
30+
}
31+
'6','7': {
32+
$udev_package = 'udev'
33+
$udevtrigger = 'udevadm trigger'
34+
$udevlogpriority = 'udevadm control --log-priority'
35+
}
36+
default: {
37+
fail("Module ${module_name} is not supported on RedHat release ${::operatingsystemmajrelease}")
38+
}
2639
}
2740
}
2841
}

0 commit comments

Comments
 (0)