hak5/wifipineapple-openwrt
1
0
Fork 0
mirror of https://github.com/hak5/wifipineapple-openwrt.git synced 2025-10-29 16:57:19 +00:00
Code Issues Packages Projects Releases Wiki Activity

CC: procd: align early init PATH with rest of OpenWrt

Browse Source 
Backport upstream Git commit 45cb04fd85d788a37367a5385e5e90dd98a0a991 to CC.

Signed-off-by: Jo-Philipp Wich <jow@openwrt.org>

git-svn-id: svn://svn.openwrt.org/openwrt/branches/chaos_calmer@48236 3c298f89-4303-0410-b956-a3cf2f4a3e73
This commit is contained in:
Jo-Philipp Wich 2016-01-14 13:06:36 +00:00
parent 04d677ea25
commit 33926ccf4d
2 changed files with 34 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
package/system/procd/Makefile
View File

@ -1,5 +1,5 @@
#
# Copyright (C) 2014-2015 OpenWrt.org
# Copyright (C) 2014-2016 OpenWrt.org
#
# This is free software, licensed under the GNU General Public License v2.
# See /LICENSE for more information.
@ -8,7 +8,7 @@
include $(TOPDIR)/rules.mk
PKG_NAME:=procd
PKG_VERSION:=2015-10-29
PKG_VERSION:=2015-10-29.1
PKG_RELEASE=$(PKG_SOURCE_VERSION)

32
package/system/procd/patches/0001-Align-early-init-PATH-with-system-wide-OpenWrt-path.patch Normal file
View File

@ -0,0 +1,32 @@
From 45cb04fd85d788a37367a5385e5e90dd98a0a991 Mon Sep 17 00:00:00 2001
From: Jo-Philipp Wich <jow@openwrt.org>
Date: Thu, 14 Jan 2016 13:51:36 +0100
Subject: [PATCH] Align early init PATH with system wide OpenWrt path value
Changeset r47080 globally unified the executable search path in OpenWrt,
now update procd to use the same path value.
This fixes diverging path values observed in programs launched by netifd
which inherits the early path value from procd.
Signed-off-by: Jo-Philipp Wich <jow@openwrt.org>
---
initd/early.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/initd/early.c b/initd/early.c
index e87774f..5821c58 100644
--- a/initd/early.c
+++ b/initd/early.c
@@ -90,7 +90,7 @@ early_mounts(void)
static void
early_env(void)
{
- setenv("PATH", "/bin:/sbin:/usr/bin:/usr/sbin", 1);
+ setenv("PATH", "/usr/sbin:/usr/bin:/sbin:/bin", 1);
}
void
--
2.1.4