diff options
author | Sergey Poznyakoff <gray@gnu.org.ua> | 2013-01-04 15:33:00 +0200 |
---|---|---|
committer | Sergey Poznyakoff <gray@gnu.org.ua> | 2013-01-04 22:11:21 +0200 |
commit | d8221ce9bdd2d7ae6162bed0e1c85e9f7a3ff8f2 (patch) | |
tree | 5fab301e38fede054aa85708c6c8590c1825e541 /src/pies.h | |
parent | 95bc9b24928eb9951f0644307e417df0bc8c53b4 (diff) | |
download | pies-d8221ce9bdd2d7ae6162bed0e1c85e9f7a3ff8f2.tar.gz pies-d8221ce9bdd2d7ae6162bed0e1c85e9f7a3ff8f2.tar.bz2 |
Fix sysvinit transition logic.
* src/pies.c (main): Call sysvinit_begin to initialize
sysvinit subsystem.
In the main loop, force wakeup if inittrans returns 1.
* src/pies.h (is_sysvinit): Rewrite macro.
(progman_sysvinit_enable): New proto.
(inittrans): Change return type.
* src/progman.c (progman_sysvinit_enable): New function.
(progman_running_p): Additional debugging.
(prog_start): Special handling for sysvinit components.
Remove calls to runlevel_match
* src/sysvinit.c (runlevel_match): Remove function.
(sysvinit_begin): New function.
(inittrans): Return boolean value indicating whether a
transition has been made. Call progman_sysvinit_enable to
change the status of sysvinit components as appropriate.
Diffstat (limited to 'src/pies.h')
-rw-r--r-- | src/pies.h | 11 |
1 files changed, 7 insertions, 4 deletions
@@ -185,4 +185,2 @@ enum pies_comp_mode -#define is_sysvinit(m) ((m)>=pies_mark_sysvinit) - #define CF_DISABLED 0x001 /* The componenet is disabled */ @@ -255,2 +253,4 @@ struct component +#define is_sysvinit(cp) ((cp)->mode >= pies_mark_sysvinit || (cp)->runlevels) + union pies_sockaddr_storage @@ -303,2 +303,5 @@ void progman_iterate_comp (int (*fun) (struct component *, void *), void *data); +void progman_sysvinit_enable (int (*fun) (struct component *, int, void *), + void *data); + void fd_report (int fd, const char *msg); @@ -452,4 +455,4 @@ struct inetd_builtin *inetd_builtin_lookup (const char *service, int socktype); /* sysvinit.c */ -int runlevel_match (struct component *comp); -void inittrans (void); +void sysvinit_begin (void); +int inittrans (void); int is_comp_wait (struct component *comp); |