diff options
| author | Jeremy Katz <katzj@redhat.com> | 2006-09-20 18:25:28 +0000 |
|---|---|---|
| committer | Jeremy Katz <katzj@redhat.com> | 2006-09-20 18:25:28 +0000 |
| commit | eb8f437dfb918032bb1b91036d76ed1afcdd1a67 (patch) | |
| tree | 210b5ed40d90cc086387db95afc9a3f22b13f1af | |
| parent | c0368fa9f2d5efde2f83fe57bcca7055038f3711 (diff) | |
| download | anaconda-eb8f437dfb918032bb1b91036d76ed1afcdd1a67.tar.gz anaconda-eb8f437dfb918032bb1b91036d76ed1afcdd1a67.tar.xz anaconda-eb8f437dfb918032bb1b91036d76ed1afcdd1a67.zip | |
2006-09-20 Jeremy Katz <katzj@redhat.com>
* syslogd.py (InstSyslog.start): Only exec syslogd if it exists
* fsset.py (FileSystemSet.mkDevRoot): Don't create /dev/root if it
already exists
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | fsset.py | 5 | ||||
| -rw-r--r-- | syslogd.py | 5 |
3 files changed, 11 insertions, 4 deletions
@@ -1,5 +1,10 @@ 2006-09-20 Jeremy Katz <katzj@redhat.com> + * syslogd.py (InstSyslog.start): Only exec syslogd if it exists + + * fsset.py (FileSystemSet.mkDevRoot): Don't create /dev/root if it + already exists + * anaconda (Anaconda.setMethod): Allow passing --targetarch (#206881) * flags.py (Flags.__init__): Set targetarch as a flag @@ -1284,8 +1284,9 @@ MAILADDR root if not os.path.exists(dev): isys.makeDevInode(root.device.getDevice(), dev) rdev = os.stat(dev).st_rdev - - os.mknod("%s/dev/root" % (instPath,), stat.S_IFBLK | 0600, rdev) + + if not os.path.exists("%s/dev/root" %(instPath,)): + os.mknod("%s/dev/root" % (instPath,), stat.S_IFBLK | 0600, rdev) # return the "boot" device def getBootDev(self): diff --git a/syslogd.py b/syslogd.py index cde46400d..a41a29e3e 100644 --- a/syslogd.py +++ b/syslogd.py @@ -73,8 +73,9 @@ class InstSyslog: if os.access (f+"/syslogd", os.X_OK): path = f+"/syslogd" break - - os.execv (path, ("syslogd", root, log)) + + if os.path.exists(path): + os.execv (path, ("syslogd", root, log)) def stop(self): if self.pid == -1: |