summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRob Crittenden <rcritten@redhat.com>2008-03-03 16:14:48 -0500
committerRob Crittenden <rcritten@redhat.com>2008-03-03 16:14:48 -0500
commitb49942fe96babbc27a225f5cf584d2c27c6b45ff (patch)
tree541628251b9d9941cfaca59f1ccff1ede695a47c
parent79557e6bf2202cdff4c940db4f9070fe56247372 (diff)
downloadfreeipa-b49942fe96babbc27a225f5cf584d2c27c6b45ff.tar.gz
freeipa-b49942fe96babbc27a225f5cf584d2c27c6b45ff.tar.xz
freeipa-b49942fe96babbc27a225f5cf584d2c27c6b45ff.zip
Close all fds when running another program. This fixes the SELinux AVCs.
Put installation log files into /var/log. 430024
-rw-r--r--ipa-client/ipa-install/ipa-client-install2
-rw-r--r--ipa-python/ipautil.py2
-rw-r--r--ipa-server/ipa-install/ipa-server-install3
3 files changed, 4 insertions, 3 deletions
diff --git a/ipa-client/ipa-install/ipa-client-install b/ipa-client/ipa-install/ipa-client-install
index a2106a59d..31eadd9cc 100644
--- a/ipa-client/ipa-install/ipa-client-install
+++ b/ipa-client/ipa-install/ipa-client-install
@@ -54,7 +54,7 @@ def logging_setup(options):
# file.
logging.basicConfig(level=logging.DEBUG,
format='%(asctime)s %(levelname)s %(message)s',
- filename='ipaclient-install.log',
+ filename='/var/log/ipaclient-install.log',
filemode='w')
console = logging.StreamHandler()
diff --git a/ipa-python/ipautil.py b/ipa-python/ipautil.py
index 919d4a6b8..4e065fc4b 100644
--- a/ipa-python/ipautil.py
+++ b/ipa-python/ipautil.py
@@ -71,7 +71,7 @@ def write_tmp_file(txt):
return fd
def run(args, stdin=None):
- p = subprocess.Popen(args, stdout=subprocess.PIPE, stderr=subprocess.PIPE)
+ p = subprocess.Popen(args, stdout=subprocess.PIPE, stderr=subprocess.PIPE, close_fds=True)
if stdin:
stdout,stderr = p.communicate(stdin)
else:
diff --git a/ipa-server/ipa-install/ipa-server-install b/ipa-server/ipa-install/ipa-server-install
index 77787b158..213fbc152 100644
--- a/ipa-server/ipa-install/ipa-server-install
+++ b/ipa-server/ipa-install/ipa-server-install
@@ -316,7 +316,8 @@ def main():
signal.signal(signal.SIGTERM, signal_handler)
signal.signal(signal.SIGINT, signal_handler)
- standard_logging_setup("ipaserver-install.log", options.debug)
+ standard_logging_setup("/var/log/ipaserver-install.log", options.debug)
+ print "\nThe log file for this installation can be found in /var/log/ipaserver-install.log")
if options.uninstall:
return uninstall()