|
|
@@ -283,7 +283,7 @@ sub createInstanceScripts {
|
|
|
my $skip = shift;
|
|
|
my $perlexec = "@perlexec@" || "/usr/bin/env perl";
|
|
|
my $myperl = "!$perlexec";
|
|
|
- my $mydevnull = (-f "/dev/null" ? " /dev/null " : " NUL ");
|
|
|
+ my $mydevnull = (-c "/dev/null" ? " /dev/null " : " NUL ");
|
|
|
|
|
|
# If we have InstScriptsEnabled, we likely have setup.inf or the argument.
|
|
|
# However, during an upgrade, we need to know if we should upgrade the template files or not.
|
|
|
@@ -997,7 +997,7 @@ sub setDefaults {
|
|
|
|
|
|
sub updateSelinuxPolicy {
|
|
|
my $inf = shift;
|
|
|
- my $mydevnull = (-f "/dev/null" ? " /dev/null " : " NUL ");
|
|
|
+ my $mydevnull = (-c "/dev/null" ? " /dev/null " : " NUL ");
|
|
|
|
|
|
# if selinux is not available, do nothing
|
|
|
if ((getLogin() eq 'root') and "@with_selinux@" and
|
|
|
@@ -1451,7 +1451,7 @@ sub removeDSInstance {
|
|
|
}
|
|
|
|
|
|
# remove the selinux label from the ports if needed
|
|
|
- my $mydevnull = (-f "/dev/null" ? " /dev/null " : " NUL ");
|
|
|
+ my $mydevnull = (-c "/dev/null" ? " /dev/null " : " NUL ");
|
|
|
if ((getLogin() eq 'root') and "@with_selinux@" and
|
|
|
-f "@sbindir@/sestatus" and !system ("@sbindir@/sestatus | egrep -i \"selinux status:\\s*enabled\" > $mydevnull 2>&1")) {
|
|
|
foreach my $port (@{$entry->{"nsslapd-port"}})
|