Ofer Schreiber has uploaded a new change for review. Change subject: packaging: engine-setup - make firewall checking more robust ......................................................................
packaging: engine-setup - make firewall checking more robust 1. Don't execute systemctl if it's not available in the system. 2. append ".service" to services name for backward compatibility. Signed-off-by: Ofer Schreiber <[email protected]> Change-Id: If10096e8f9e1141d2c0a45b600b0e82e849b59ba --- M packaging/fedora/setup/common_utils.py M packaging/fedora/setup/engine-setup.py 2 files changed, 2 insertions(+), 2 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/03/11103/1 diff --git a/packaging/fedora/setup/common_utils.py b/packaging/fedora/setup/common_utils.py index e5c1e06..d3ae6fb 100755 --- a/packaging/fedora/setup/common_utils.py +++ b/packaging/fedora/setup/common_utils.py @@ -1285,7 +1285,7 @@ cmd = [ basedefs.EXEC_SYSTEMCTL, "show", - self.name + self.name + ".service" ] out, rc = execCmd(cmdList=cmd) sysd = "LoadState=loaded" in out diff --git a/packaging/fedora/setup/engine-setup.py b/packaging/fedora/setup/engine-setup.py index e7bab64..d131a27 100755 --- a/packaging/fedora/setup/engine-setup.py +++ b/packaging/fedora/setup/engine-setup.py @@ -901,7 +901,7 @@ fwd = utils.Service("firewalld") # Add available services to list - if fwd.available(): + if os.path.exists(basedefs.EXEC_SYSTEMCTL) and fwd.available(): firewalls.append("Firewalld") if iptables.available(): firewalls.append("IPTables") -- To view, visit http://gerrit.ovirt.org/11103 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: If10096e8f9e1141d2c0a45b600b0e82e849b59ba Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Ofer Schreiber <[email protected]> _______________________________________________ Engine-patches mailing list [email protected] http://lists.ovirt.org/mailman/listinfo/engine-patches
