michael/webmin
1
0
Fork 0
mirror of https://github.com/webmin/webmin.git synced 2026-03-20 16:50:24 +00:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Support systemd framework on Fedora 16

Browse Source 
https://sourceforge.net/tracker/?func=detail&atid=117457&aid=3451866&group_id=17457
This commit is contained in:
Jamie Cameron
2011-12-06 14:47:19 -08:00
parent 312d0600f1
commit 8fe0294bea
1 changed files with 21 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
firewall/redhat-linux-lib.pl
View File

@@ -8,7 +8,8 @@ $init_script = "$init::config{'init_dir'}/iptables";
# Returns an error message if something is wrong with iptables on this system
sub check_iptables
{
if (!-r $init_script) {
if (!-r $init_script &&
&backquote_command("service iptables status 2>/dev/null") !~ /Loaded:\s+loaded/) {
return &text('redhat_escript', "<tt>$init_script</tt>");
}
return undef if ($gconfig{'os_type'} eq 'trustix-linux');
@@ -32,22 +33,33 @@ $iptables_save_file = "/etc/sysconfig/iptables";
# Applies the current iptables configuration from the save file
sub apply_iptables
{
local $out = &backquote_logged("cd / ; $init_script restart 2>&1");
$out =~ s/\033[^m]+m//g;
return $? || $out =~ /FAILED/ ? "<pre>$out</pre>" : undef;
if (-r $init_script) {
local $out = &backquote_logged("cd / ; $init_script restart 2>&1");
$out =~ s/\033[^m]+m//g;
return $? || $out =~ /FAILED/ ? "<pre>$out</pre>" : undef;
}
else {
local $out = &backquote_logged("cd ; service iptables restart 2>&1");
return $? || $out =~ /FAILED/ ? "<pre>$out</pre>" : undef;
}
}
# unapply_iptables()
# Writes the current iptables configuration to the save file
sub unapply_iptables
{
$out = &backquote_logged("cd / ; $init_script save 2>&1 </dev/null");
$out =~ s/\033[^m]+m//g;
if ($? && $out =~ /usage/i) {
# 'save' argument not supported .. call iptables-save manually
if (-r $init_script) {
$out = &backquote_logged("cd / ; $init_script save 2>&1 </dev/null");
$out =~ s/\033[^m]+m//g;
if ($? && $out =~ /usage/i) {
# 'save' argument not supported .. call iptables-save manually
return &iptables_save();
}
return $? || $out =~ /FAILED/ ? "<pre>$out</pre>" : undef;
}
else {
return &iptables_save();
}
return $? || $out =~ /FAILED/ ? "<pre>$out</pre>" : undef;
}
# started_at_boot()