Skip to content

Commit afd6ec5

Browse files
committed
Reinstate the operatingsystem check.
1 parent 6cab5a5 commit afd6ec5

File tree

1 file changed

+22
-21
lines changed

1 file changed

+22
-21
lines changed

manifests/params.pp

Lines changed: 22 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -5,39 +5,40 @@
55
class udev::params {
66
$udevadm_path = '/sbin'
77

8-
case $::operatingsystem {
8+
case $::osfamily {
99
'debian': {
1010
$udev_package = 'udev'
1111
$udevlogpriority = 'udevadm control --log-priority'
1212
$udevtrigger = 'udevadm trigger'
1313
}
1414
'redhat': {
15-
case $::operatingsystemmajrelease {
16-
'5': {
17-
$udev_package = 'udev'
18-
$udevtrigger = 'udevtrigger'
19-
$udevlogpriority = 'udevcontrol log_priority'
20-
}
21-
'6','7': {
22-
$udev_package = 'udev'
15+
if $::operatingsystem == 'Fedora' {
16+
if ($::operatingsystemmajrelease >= 20) {
17+
$udev_package = 'systemd'
2318
$udevtrigger = 'udevadm trigger'
2419
$udevlogpriority = 'udevadm control --log-priority'
2520
}
26-
default: {
27-
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}")
2823
}
29-
}
30-
}
31-
'fedora': {
32-
if ($::operatingsystemmajrelease >= 20) {
33-
$udev_package = 'systemd'
34-
$udevtrigger = 'udevadm trigger'
35-
$udevlogpriority = 'udevadm control --log-priority'
36-
}
37-
else {
38-
fail("Module ${module_name} might not be supported on Fedora release ${::operatingsystemmajrelease}")
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+
}
3939
}
4040
}
41+
}
4142
default: {
4243
fail("Module ${module_name} is not supported on ${::operatingsystem}")
4344
}

0 commit comments

Comments
 (0)