emo/openrc
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Move more stuff to #defines

Browse Source
This commit is contained in:
Roy Marples 2007-08-28 09:13:46 +00:00
parent 36118e7dbd
commit d6acd7d83e
3 changed files with 21 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/librc.c
View File

@ -33,13 +33,13 @@ static const char *rc_service_state_names[] = {
bool rc_runlevel_starting (void)
{
return (rc_is_dir (RC_SVCDIR "/softscripts.old"));
return (rc_is_dir (RC_STARTING));
}
librc_hidden_def(rc_runlevel_starting)
bool rc_runlevel_stopping (void)
{
return (rc_is_dir (RC_SVCDIR "/softscripts.new"));
return (rc_is_dir (RC_STOPPING));
}
librc_hidden_def(rc_runlevel_stopping)

4
src/rc-misc.h
View File

@ -21,6 +21,10 @@
#define RC_INITDIR "/etc/init.d"
#define RC_CONFDIR "/etc/conf.d"
#define RC_KSOFTLEVEL RC_SVCDIR "/ksoftlevel"
#define RC_STARTING RC_SVCDIR "/softscripts.new"
#define RC_STOPPING RC_SVCDIR "/softscripts.old"
#define RC_SVCDIR_STARTING RC_SVCDIR "/starting"
#define RC_SVCDIR_INACTIVE RC_SVCDIR "/inactive"
#define RC_SVCDIR_STARTED RC_SVCDIR "/started"

31
src/rc.c
View File

@ -45,7 +45,6 @@
#define HALTSH RC_INITDIR "/halt.sh"
#define SULOGIN "/sbin/sulogin"
#define KSOFTLEVEL RC_SVCDIR "/ksoftlevel"
#define INTERACTIVE RC_SVCDIR "/interactive"
#define DEVBOOT "/dev/.rcboot"
@ -108,10 +107,10 @@ static void cleanup (void)
/* Clean runlevel start, stop markers */
if (! rc_in_plugin) {
if (rc_is_dir (RC_SVCDIR "softscripts.new"))
rc_rm_dir (RC_SVCDIR "softscripts.new", true);
if (rc_is_dir (RC_SVCDIR "softscripts.old"))
rc_rm_dir (RC_SVCDIR "softscripts.old", true);
if (rc_is_dir (RC_STARTING))
rc_rm_dir (RC_STARTING, true);
if (rc_is_dir (RC_STOPPING))
rc_rm_dir (RC_STOPPING, true);
}
}
@ -543,14 +542,14 @@ static void set_ksoftlevel (const char *runlevel)
strcmp (runlevel, RC_LEVEL_SINGLE) == 0 ||
strcmp (runlevel, RC_LEVEL_SYSINIT) == 0)
{
if (rc_exists (KSOFTLEVEL) &&
unlink (KSOFTLEVEL) != 0)
eerror ("unlink `%s': %s", KSOFTLEVEL, strerror (errno));
if (rc_exists (RC_KSOFTLEVEL) &&
unlink (RC_KSOFTLEVEL) != 0)
eerror ("unlink `%s': %s", RC_KSOFTLEVEL, strerror (errno));
return;
}
if (! (fp = fopen (KSOFTLEVEL, "w"))) {
eerror ("fopen `%s': %s", KSOFTLEVEL, strerror (errno));
if (! (fp = fopen (RC_KSOFTLEVEL, "w"))) {
eerror ("fopen `%s': %s", RC_KSOFTLEVEL, strerror (errno));
return;
}
@ -563,11 +562,11 @@ static int get_ksoftlevel (char *buffer, int buffer_len)
FILE *fp;
int i = 0;
if (! rc_exists (KSOFTLEVEL))
if (! rc_exists (RC_KSOFTLEVEL))
return (0);
if (! (fp = fopen (KSOFTLEVEL, "r"))) {
eerror ("fopen `%s': %s", KSOFTLEVEL, strerror (errno));
if (! (fp = fopen (RC_KSOFTLEVEL, "r"))) {
eerror ("fopen `%s': %s", RC_KSOFTLEVEL, strerror (errno));
return (-1);
}
@ -1015,7 +1014,7 @@ int main (int argc, char **argv)
if (rc_is_dir (RC_SVCDIR "failed"))
rc_rm_dir (RC_SVCDIR "failed", false);
mkdir (RC_SVCDIR "/softscripts.new", 0755);
mkdir (RC_STOPPING, 0755);
#ifdef __linux__
/* udev likes to start services before we're ready when it does
@ -1239,7 +1238,7 @@ int main (int argc, char **argv)
/* Notify the plugins we have finished */
rc_plugin_run (rc_hook_runlevel_stop_out, runlevel);
rmdir (RC_SVCDIR "/softscripts.new");
rmdir (RC_STOPPING);
/* Store the new runlevel */
if (newlevel) {
@ -1264,7 +1263,7 @@ int main (int argc, char **argv)
sulogin (false);
}
mkdir (RC_SVCDIR "softscripts.old", 0755);
mkdir (RC_STARTING, 0755);
rc_plugin_run (rc_hook_runlevel_start_in, runlevel);
/* Re-add our coldplugged services if they stopped */