diff options
| author | Jeremy Katz <katzj@redhat.com> | 2007-01-18 18:29:00 +0000 |
|---|---|---|
| committer | Jeremy Katz <katzj@redhat.com> | 2007-01-18 18:29:00 +0000 |
| commit | 4a7d5899d75bb5c59216af8e963534e48c932c77 (patch) | |
| tree | 68d0f359fe81a4dafaeec204ac490cdfd2d46d70 /syslogd.py | |
| parent | 13bb088ffbff42cda9b2b7b1acdf34f2df58a3a1 (diff) | |
| download | anaconda-4a7d5899d75bb5c59216af8e963534e48c932c77.tar.gz anaconda-4a7d5899d75bb5c59216af8e963534e48c932c77.tar.xz anaconda-4a7d5899d75bb5c59216af8e963534e48c932c77.zip | |
2007-01-18 Jeremy Katz <katzj@redhat.com>
* syslogd.py (InstSyslog.start): Ensure that we have a syslogd or
don't try to start. Otherwise, we end up hanging things
* yuminstall.py (YumBackend.__init__): yum installs can do package
selection
* livecd.py: Add live CD image copy backend and install method.
* installclasses/fedora.py: Handle installclass API changes; allow
livecd method
* installclass.py (BaseInstallClass.setSteps): Take anaconda
instead of dispatch as an argument; use so that the backend
upgrade allowing + package selection can work
(BaseInstallClass.setDefaultPartitioning): Make it easier to
default to no-LVM
* kickstart.py (Kickstart.setSteps): Tweak for calling change
* upgradeclass.py (InstallClass.setSteps): Likewise.
* installclasses/rhel.py (InstallClass.setSteps): Likewise.
* anaconda: Pass anaconda to instClass.setSteps; don't depend on
the existence of /mnt/runtime/... with x_already_set
* backend.py (AnacondaBackend.__init__): Let the backend define
whether or not upgrades are supported
(AnacondaBackend.doPreInstall): postInstall kills the log, start
it in the pre
(AnacondaBackend.initLog): Ensure the dir we want to use exists
(writeConfiguration): Write instdata before backend bits
Diffstat (limited to 'syslogd.py')
| -rw-r--r-- | syslogd.py | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/syslogd.py b/syslogd.py index a41a29e3e..578893372 100644 --- a/syslogd.py +++ b/syslogd.py @@ -64,6 +64,9 @@ class InstSyslog: self.pid = -1; def start (self, root, log): + # don't run in the "install from livecd" case + if not os.path.exists("/usr/bin/syslogd"): + return self.pid = os.fork () if not self.pid: # look on PYTHONPATH first, so we use updated anaconda @@ -79,7 +82,8 @@ class InstSyslog: def stop(self): if self.pid == -1: - raise RuntimeError, "syslogd not running" + log.warn("syslogd not running to kill!") + return try: os.kill (self.pid, 15) except OSError, (num, msg): |