diff options
| author | Mageia SVN-Git Migration <svn-git-migration@mageia.org> | 2011-02-06 22:37:08 +0000 |
|---|---|---|
| committer | Mageia SVN-Git Migration <svn-git-migration@mageia.org> | 2011-02-06 22:37:08 +0000 |
| commit | fd8bbba2f02b8bccd69e67c326fd320c0827941d (patch) | |
| tree | ade69986b2f99e113c95009736399966d4a3d511 /mdk-stage1/init.c | |
| parent | 368f416649ed34557702a946ec8c0cec2fd45294 (diff) | |
| download | drakx-fd8bbba2f02b8bccd69e67c326fd320c0827941d.tar drakx-fd8bbba2f02b8bccd69e67c326fd320c0827941d.tar.gz drakx-fd8bbba2f02b8bccd69e67c326fd320c0827941d.tar.bz2 drakx-fd8bbba2f02b8bccd69e67c326fd320c0827941d.tar.xz drakx-fd8bbba2f02b8bccd69e67c326fd320c0827941d.zip | |
Synthesized commit during git-svn import combining previous Mandriva history with Mageia.
This commit consitsts of the following subversion commits:
------------------------------------------------------------------------
r431 | dmorgan | 2011-02-06 01:58:02 +0000 (Sun, 06 Feb 2011) | 1 line
Add drakx structure on the SVN
------------------------------------------------------------------------
r432 | dmorgan | 2011-02-06 01:59:38 +0000 (Sun, 06 Feb 2011) | 1 line
Import cleaned advertising
------------------------------------------------------------------------
r446 | dmorgan | 2011-02-06 22:37:08 +0000 (Sun, 06 Feb 2011) | 1 line
Import Clean perl-install
------------------------------------------------------------------------
r448 | dmorgan | 2011-02-06 23:02:36 +0000 (Sun, 06 Feb 2011) | 1 line
Add cleaned files
------------------------------------------------------------------------
r449 | dmorgan | 2011-02-06 23:03:52 +0000 (Sun, 06 Feb 2011) | 1 line
Import cleaned kernel
------------------------------------------------------------------------
r450 | dmorgan | 2011-02-06 23:23:30 +0000 (Sun, 06 Feb 2011) | 1 line
Import cleaned tools
------------------------------------------------------------------------
r451 | dmorgan | 2011-02-07 00:01:56 +0000 (Mon, 07 Feb 2011) | 1 line
Import stage1
------------------------------------------------------------------------
r473 | dmorgan | 2011-02-07 11:20:50 +0000 (Mon, 07 Feb 2011) | 1 line
Import images
------------------------------------------------------------------------
r497 | ennael | 2011-02-09 21:02:06 +0000 (Wed, 09 Feb 2011) | 2 lines
readd missing file
------------------------------------------------------------------------
r502 | pterjan | 2011-02-09 23:30:32 +0000 (Wed, 09 Feb 2011) | 1 line
Import rescue
------------------------------------------------------------------------
r603 | ennael | 2011-02-24 13:32:54 +0000 (Thu, 24 Feb 2011) | 2 lines
import cleaned rescue for Mageia
------------------------------------------------------------------------
r2061 | tv | 2011-10-20 20:32:19 +0100 (Thu, 20 Oct 2011) | 1 line
import (cleaned) doc
------------------------------------------------------------------------
Diffstat (limited to 'mdk-stage1/init.c')
| -rw-r--r-- | mdk-stage1/init.c | 19 |
1 files changed, 0 insertions, 19 deletions
diff --git a/mdk-stage1/init.c b/mdk-stage1/init.c index a74a703d2..8130b422b 100644 --- a/mdk-stage1/init.c +++ b/mdk-stage1/init.c @@ -219,25 +219,6 @@ void doklog() } } - /* examine some fd's in the hope to find some syslog outputs from programs */ - for (readfd = 0; readfd < 20; ++readfd) { - if (FD_ISSET(readfd, &readset) && FD_ISSET(readfd, &unixs)) { - i = read(readfd, buf, sizeof(buf)); - if (i > 0) { - /* grep out the output of RPM telling that it installed/removed some packages */ - if (!strstr(buf, "mdk installed") && !strstr(buf, "mdk removed")) { - if (out >= 0) - write(out, buf, i); - write(log, buf, i); - } - } else if (i == 0) { - /* socket closed */ - close(readfd); - FD_CLR(readfd, &unixs); - } - } - } - /* the socket has moved, new stuff to do */ if (sock >= 0 && FD_ISSET(sock, &readset)) { s = sizeof(sockaddr); |