Fix sysvinit execution environment, simplify boot state system.

* src/pies.c (_cb_runlevels): Bugfix.
(set_console_dev): Move to sysvinit.c
* src/pies.h (progman_sysvinit_enable): Remove proto.
(console_open, telinit): New protos.
(sysvinit_environ_hint): New extern.
* src/prog.h (prog_stop): New proto.
* src/progman.c (env_concat): Bugfix.
(env_concat): In sysvinit mode, apply sysvinit_environ_hint
to the environment.
(console_open, console_stty): Move to sysvinit.c

* src/sysvinit.c (boot_state): Simplify state set.
(getinitdefault, askrunlevel): New functions.
(sysvinit_runlevel_setup): New function.
(enablecomp): Change signature to match progman_foreach API.
(sysvinit_begin): Prepare console, become a session leader,
prepare environment.
(inittrans): Call sysvinit_runlevel_setup

* src/socket.c (calc_fd_max): Fix return type.
* src/acl.c (acl_copy): Remove unused variable.

1 files changed, 4 insertions, 2 deletions

diff --git a/src/pies.h b/src/pies.h
index 0da13e3..ca50a26 100644
--- a/src/pies.h
+++ b/src/pies.h
@@ -303,8 +303,6 @@ void progman_run_comp (struct component *comp, int fd,
 
 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);
 
@@ -462,6 +460,10 @@ void sysvinit_begin (void);
 int inittrans (void);
 int is_comp_wait (struct component *comp);
 int is_valid_runlevel (int c);
+int console_open (int mode);
+int telinit (const char *arg);
+
+extern char *sysvinit_environ_hint[];
 
 #ifndef INIT_FIFO
 # define INIT_FIFO  "/dev/initctl"