[Pkg-sysvinit-commits] r1434 - in sysvinit-upstream/trunk: doc src

[Petter Reinholdtsen]

Author: pere
Date: 2009-07-11 06:56:56 +0000 (Sat, 11 Jul 2009)
New Revision: 1434

Modified:
   sysvinit-upstream/trunk/doc/Changelog
   sysvinit-upstream/trunk/src/init.c
   sysvinit-upstream/trunk/src/init.h
Log:
Change init to use setenv() instead of putenv, make sure the PATH
value is usable on re-exec.  Patch from Thomas Hood.


Modified: sysvinit-upstream/trunk/doc/Changelog
===================================================================
--- sysvinit-upstream/trunk/doc/Changelog	2009-07-11 06:51:14 UTC (rev 1433)
+++ sysvinit-upstream/trunk/doc/Changelog	2009-07-11 06:56:56 UTC (rev 1434)
@@ -49,6 +49,8 @@
     not exist.  Patch from Thomas Hood.
   * Let bootlogd also look at ttyB* devices to work on HPPA.  Patch
     from Thomas Hood.
+  * Change init to use setenv() instead of putenv, make sure the PATH
+    value is usable on re-exec.  Patch from Thomas Hood.
 
  -- Petter Reinholdtsen <pere at debian.org>  Fri, 30 Jul 2004 14:14:58 +0200
 

Modified: sysvinit-upstream/trunk/src/init.c
===================================================================
--- sysvinit-upstream/trunk/src/init.c	2009-07-11 06:51:14 UTC (rev 1433)
+++ sysvinit-upstream/trunk/src/init.c	2009-07-11 06:56:56 UTC (rev 1434)
@@ -2420,7 +2420,7 @@
   	/*
 	 *	Set default PATH variable.
 	 */
-  	putenv(PATH_DFL);
+  	setenv("PATH", PATH_DEFAULT, 1 /* Overwrite */);
 
   	/*
 	 *	Initialize /var/run/utmp (only works if /var is on
@@ -2459,6 +2459,11 @@
 	initlog(L_CO, bootmsg, "reloading");
 	sigfillset(&sgt);
 	sigprocmask(SIG_UNBLOCK, &sgt, NULL);
+
+  	/*
+	 *	Set default PATH variable.
+	 */
+  	setenv("PATH", PATH_DEFAULT, 0 /* Don't overwrite */);
   }
   start_if_needed();
 

Modified: sysvinit-upstream/trunk/src/init.h
===================================================================
--- sysvinit-upstream/trunk/src/init.h	2009-07-11 06:51:14 UTC (rev 1433)
+++ sysvinit-upstream/trunk/src/init.h	2009-07-11 06:56:56 UTC (rev 1434)
@@ -24,7 +24,7 @@
 #define SLEEPTIME  300			/* Disable time */
 
 /* Default path inherited by every child. */
-#define PATH_DFL   "PATH=/bin:/usr/bin:/sbin:/usr/sbin"
+#define PATH_DEFAULT   "/sbin:/usr/sbin:/bin:/usr/bin"
 
 
 /* Prototypes. */