diff options
| author | Jeremy Katz <katzj@redhat.com> | 2003-04-24 15:46:31 +0000 |
|---|---|---|
| committer | Jeremy Katz <katzj@redhat.com> | 2003-04-24 15:46:31 +0000 |
| commit | 0a562126d84c59a113231ae7ab38984f92d62153 (patch) | |
| tree | 5e87b9094f4ebdc328979e3a0640dee5f1fc40cb /syslogd.py | |
| parent | dd200d781bd9012f562399c2ee69c23fe60d86b9 (diff) | |
| download | anaconda-0a562126d84c59a113231ae7ab38984f92d62153.tar.gz anaconda-0a562126d84c59a113231ae7ab38984f92d62153.tar.xz anaconda-0a562126d84c59a113231ae7ab38984f92d62153.zip | |
another taroon merge. tagged before as before-taroon-merge, after as
after-taroon-merge
this one adds s390 fixes, basic i/p series platform support, support for
multiple kernels and one second stage, cmdline kickstart mode (nice for s390),
some warning cleanups.
Diffstat (limited to 'syslogd.py')
| -rw-r--r-- | syslogd.py | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/syslogd.py b/syslogd.py index 7722e2717..f484de05a 100644 --- a/syslogd.py +++ b/syslogd.py @@ -85,7 +85,10 @@ class InstSyslog: def stop(self): if self.pid == -1: raise RuntimeError, "syslogd not running" - os.kill (self.pid, 15) + try: + os.kill (self.pid, 15) + except OSError, (num, msg): + log("killing syslogd failed: %s %s" %(num, msg)) try: os.waitpid (self.pid, 0) |