nixpkgs/pkgs/os-specific/linux/upstart/cfgdir.patch
Eelco Dolstra 1051c44d9c * Don't use /bin/sh.
* Don't clear the PATH.

svn path=/nixpkgs/trunk/; revision=7077
2006-11-19 22:02:16 +00:00

29 lines
841 B
Diff

diff -rc upstart-0.3.0-orig/init/main.c upstart-0.3.0/init/main.c
*** upstart-0.3.0-orig/init/main.c 2006-10-13 14:35:16.000000000 +0200
--- upstart-0.3.0/init/main.c 2006-11-19 21:41:01.000000000 +0100
***************
*** 206,215 ****
control_open ();
/* Read configuration */
! cfg_watch_dir (NULL, CFG_DIR, NULL);
/* Set the PATH environment variable */
! setenv ("PATH", PATH, TRUE);
/* Generate and run the startup event or read the state from the
--- 206,217 ----
control_open ();
/* Read configuration */
! char *cfg_dir = getenv("UPSTART_CFG_DIR");
! if (!cfg_dir) cfg_dir = CFG_DIR;
! cfg_watch_dir (NULL, cfg_dir, NULL);
/* Set the PATH environment variable */
! /* setenv ("PATH", PATH, TRUE); */
/* Generate and run the startup event or read the state from the