aboutsummaryrefslogtreecommitdiff
path: root/src/rc
diff options
context:
space:
mode:
authorRoy Marples <roy@marples.name>2008-01-05 20:43:32 +0000
committerRoy Marples <roy@marples.name>2008-01-05 20:43:32 +0000
commite6c9bdf2a30d84e35b783146ebe36314b4269ffb (patch)
treef9a3d84e4e70ae56a8d6b56d30fa4425cea1154c /src/rc
parentc92be49041a7b56f651a93e71e15e94bc8727489 (diff)
Add the missing changes from the recent Makefile updates
Diffstat (limited to 'src/rc')
-rw-r--r--src/rc/checkpath.c4
-rw-r--r--src/rc/fstabinfo.c6
-rw-r--r--src/rc/mountinfo.c6
-rw-r--r--src/rc/rc-depend.c6
-rw-r--r--src/rc/rc-logger.c4
-rw-r--r--src/rc/rc-plugin.c6
-rw-r--r--src/rc/rc-status.c6
-rw-r--r--src/rc/rc-update.c6
-rw-r--r--src/rc/rc.c11
-rw-r--r--src/rc/runscript.c24
-rw-r--r--src/rc/start-stop-daemon.c6
11 files changed, 42 insertions, 43 deletions
diff --git a/src/rc/checkpath.c b/src/rc/checkpath.c
index 612a0769..a4d3da1e 100644
--- a/src/rc/checkpath.c
+++ b/src/rc/checkpath.c
@@ -43,8 +43,8 @@
#include <unistd.h>
#include "builtins.h"
-#include "einfo.h"
-#include "rc-misc.h"
+#include "../libeinfo/einfo.h"
+#include "../rc-misc.h"
static const char *applet;
diff --git a/src/rc/fstabinfo.c b/src/rc/fstabinfo.c
index 5f8e469a..04f03846 100644
--- a/src/rc/fstabinfo.c
+++ b/src/rc/fstabinfo.c
@@ -65,10 +65,10 @@
#endif
#include "builtins.h"
-#include "einfo.h"
+#include "../libeinfo/einfo.h"
#include "rc.h"
-#include "rc-misc.h"
-#include "strlist.h"
+#include "../rc-misc.h"
+#include "../strlist.h"
#ifdef HAVE_GETMNTENT
static struct mntent *getmntfile (const char *file)
diff --git a/src/rc/mountinfo.c b/src/rc/mountinfo.c
index 05ce8dd7..155e8601 100644
--- a/src/rc/mountinfo.c
+++ b/src/rc/mountinfo.c
@@ -50,10 +50,10 @@
#include <regex.h>
#include "builtins.h"
-#include "einfo.h"
+#include "../libeinfo/einfo.h"
#include "rc.h"
-#include "rc-misc.h"
-#include "strlist.h"
+#include "../rc-misc.h"
+#include "../strlist.h"
static const char *applet;
diff --git a/src/rc/rc-depend.c b/src/rc/rc-depend.c
index c5e9e662..da99a5c3 100644
--- a/src/rc/rc-depend.c
+++ b/src/rc/rc-depend.c
@@ -40,10 +40,10 @@
#include <string.h>
#include "builtins.h"
-#include "einfo.h"
+#include "../libeinfo/einfo.h"
#include "rc.h"
-#include "rc-misc.h"
-#include "strlist.h"
+#include "../rc-misc.h"
+#include "../strlist.h"
static const char *applet;
diff --git a/src/rc/rc-logger.c b/src/rc/rc-logger.c
index 675a4d23..133026af 100644
--- a/src/rc/rc-logger.c
+++ b/src/rc/rc-logger.c
@@ -48,9 +48,9 @@
# include <libutil.h>
#endif
-#include "einfo.h"
+#include "../libeinfo/einfo.h"
#include "rc-logger.h"
-#include "rc-misc.h"
+#include "../rc-misc.h"
#include "rc.h"
#define LOGFILE RC_SVCDIR "/rc.log"
diff --git a/src/rc/rc-plugin.c b/src/rc/rc-plugin.c
index 613f049e..3f59544b 100644
--- a/src/rc/rc-plugin.c
+++ b/src/rc/rc-plugin.c
@@ -41,11 +41,11 @@
#include <string.h>
#include <unistd.h>
-#include "einfo.h"
+#include "../libeinfo/einfo.h"
#include "rc.h"
-#include "rc-misc.h"
+#include "../rc-misc.h"
#include "rc-plugin.h"
-#include "strlist.h"
+#include "../strlist.h"
#define RC_PLUGIN_HOOK "rc_plugin_hook"
diff --git a/src/rc/rc-status.c b/src/rc/rc-status.c
index 155192fa..1b943cf6 100644
--- a/src/rc/rc-status.c
+++ b/src/rc/rc-status.c
@@ -36,10 +36,10 @@
#include <unistd.h>
#include "builtins.h"
-#include "einfo.h"
+#include "../libeinfo/einfo.h"
#include "rc.h"
-#include "rc-misc.h"
-#include "strlist.h"
+#include "../rc-misc.h"
+#include "../strlist.h"
static const char *applet;
diff --git a/src/rc/rc-update.c b/src/rc/rc-update.c
index 4f07503f..bbf23af0 100644
--- a/src/rc/rc-update.c
+++ b/src/rc/rc-update.c
@@ -39,10 +39,10 @@
#include <unistd.h>
#include "builtins.h"
-#include "einfo.h"
+#include "../libeinfo/einfo.h"
#include "rc.h"
-#include "rc-misc.h"
-#include "strlist.h"
+#include "../rc-misc.h"
+#include "../strlist.h"
static const char *applet = NULL;
diff --git a/src/rc/rc.c b/src/rc/rc.c
index a33b6dcf..cbb9a152 100644
--- a/src/rc/rc.c
+++ b/src/rc/rc.c
@@ -59,12 +59,12 @@ const char rc_copyright[] = "Copyright (c) 2007-2008 Roy Marples";
#include <unistd.h>
#include "builtins.h"
-#include "einfo.h"
+#include "../libeinfo/einfo.h"
#include "rc.h"
#include "rc-logger.h"
-#include "rc-misc.h"
+#include "../rc-misc.h"
#include "rc-plugin.h"
-#include "strlist.h"
+#include "../strlist.h"
#include "version.h"
@@ -1063,14 +1063,13 @@ int main (int argc, char **argv)
run_script (INITEARLYSH);
uname (&uts);
- printf ("\n %sOpenRC %s" VERSION "%s is starting up %s",
+ printf ("\n %sOpenRC %s" VERSION "%s is starting up %s\n\n",
#ifdef BRANDING
BRANDING
#else
""
#endif
- "\n\n",
- ecolor (ECOLOR_GOOD), ecolor (ECOLOR_HILITE),
+ , ecolor (ECOLOR_GOOD), ecolor (ECOLOR_HILITE),
ecolor (ECOLOR_NORMAL));
if (! rc_yesno (getenv ("EINFO_QUIET")) &&
diff --git a/src/rc/runscript.c b/src/rc/runscript.c
index 1385bb02..615b4119 100644
--- a/src/rc/runscript.c
+++ b/src/rc/runscript.c
@@ -54,11 +54,11 @@
#endif
#include "builtins.h"
-#include "einfo.h"
+#include "../libeinfo/einfo.h"
#include "rc.h"
-#include "rc-misc.h"
+#include "../rc-misc.h"
#include "rc-plugin.h"
-#include "strlist.h"
+#include "../strlist.h"
#define SELINUX_LIB RC_LIBDIR "/runscript_selinux.so"
@@ -1080,14 +1080,10 @@ int runscript (int argc, char **argv)
if ((softlevel = xstrdup (getenv ("RC_SOFTLEVEL"))) == NULL) {
/* Ensure our environment is pure
Also, add our configuration to it */
+ char *p;
env = env_filter ();
- tmplist = env_config ();
- rc_strlist_join (&env, tmplist);
- rc_strlist_free (tmplist);
- tmplist = NULL;
if (env) {
- char *p;
#ifdef __linux__
/* clearenv isn't portable, but there's no harm in using it
@@ -1108,12 +1104,16 @@ int runscript (int argc, char **argv)
}
tmp = NULL;
#endif
-
- STRLIST_FOREACH (env, p, i)
- putenv (p);
- /* We don't free our list as that would be null in environ */
}
+ tmplist = env_config ();
+ rc_strlist_join (&env, tmplist);
+ rc_strlist_free (tmplist);
+ tmplist = NULL;
+ STRLIST_FOREACH (env, p, i)
+ putenv (p);
+ /* We don't free our list as that would be null in environ */
+
softlevel = rc_runlevel_get ();
}
diff --git a/src/rc/start-stop-daemon.c b/src/rc/start-stop-daemon.c
index bf03dbec..bfd92026 100644
--- a/src/rc/start-stop-daemon.c
+++ b/src/rc/start-stop-daemon.c
@@ -68,10 +68,10 @@ static struct pam_conv conv = { NULL, NULL};
#endif
#include "builtins.h"
-#include "einfo.h"
+#include "../libeinfo/einfo.h"
#include "rc.h"
-#include "rc-misc.h"
-#include "strlist.h"
+#include "../rc-misc.h"
+#include "../strlist.h"
typedef struct schedulelist
{