EljakimHerrewijnen/Openwrt
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

base-files: sanitize and unify $PATH

Browse Source 
Previously init and hotplug paths were different from console.

Signed-off-by: Steven Barth <steven@midlink.org>

SVN-Revision: 47080
This commit is contained in:
Steven Barth 2015-10-02 08:24:32 +00:00
parent a24f7305cc
commit d7023fc0bc
4 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
package/base-files/Makefile
View File

@ -11,7 +11,7 @@ include $(INCLUDE_DIR)/kernel.mk
include $(INCLUDE_DIR)/version.mk include $(INCLUDE_DIR)/version.mk
PKG_NAME:=base-files PKG_NAME:=base-files
PKG_RELEASE:=159 PKG_RELEASE:=160
PKG_FILE_DEPENDS:=$(PLATFORM_DIR)/ $(GENERIC_PLATFORM_DIR)/base-files/ PKG_FILE_DEPENDS:=$(PLATFORM_DIR)/ $(GENERIC_PLATFORM_DIR)/base-files/
PKG_BUILD_DEPENDS:=opkg/host usign/host PKG_BUILD_DEPENDS:=opkg/host usign/host

4
package/base-files/files/etc/preinit
View File

@ -4,7 +4,7 @@
[ -z "$PREINIT" ] && exec /sbin/init [ -z "$PREINIT" ] && exec /sbin/init
export PATH=/bin:/sbin:/usr/bin:/usr/sbin export PATH=/usr/sbin:/usr/bin:/sbin:/bin
pi_ifname= pi_ifname=
pi_ip=192.168.1.1 pi_ip=192.168.1.1
@ -20,7 +20,7 @@ fs_failsafe_wait_timeout=2
pi_suppress_stderr="y" pi_suppress_stderr="y"
pi_init_suppress_stderr="y" pi_init_suppress_stderr="y"
pi_init_path="/bin:/sbin:/usr/bin:/usr/sbin" pi_init_path="/usr/sbin:/usr/bin:/sbin:/bin"
pi_init_cmd="/sbin/init" pi_init_cmd="/sbin/init"
. /lib/functions.sh . /lib/functions.sh

2
package/base-files/files/etc/profile
View File

@ -2,7 +2,7 @@
[ -f /etc/banner ] && cat /etc/banner [ -f /etc/banner ] && cat /etc/banner
[ -e /tmp/.failsafe ] && cat /etc/banner.failsafe [ -e /tmp/.failsafe ] && cat /etc/banner.failsafe
export PATH=/usr/bin:/usr/sbin:/bin:/sbin export PATH=/usr/sbin:/usr/bin:/sbin:/bin
export HOME=$(grep -e "^${USER:-root}:" /etc/passwd | cut -d ":" -f 6) export HOME=$(grep -e "^${USER:-root}:" /etc/passwd | cut -d ":" -f 6)
export HOME=${HOME:-/root} export HOME=${HOME:-/root}
export PS1='\u@\h:\w\$ ' export PS1='\u@\h:\w\$ '

2
package/base-files/files/sbin/hotplug-call
View File

@ -5,7 +5,7 @@ export HOTPLUG_TYPE="$1"
. /lib/functions.sh . /lib/functions.sh
PATH=/bin:/sbin:/usr/bin:/usr/sbin PATH=/usr/sbin:/usr/bin:/sbin:/bin
LOGNAME=root LOGNAME=root
USER=root USER=root
export PATH LOGNAME USER export PATH LOGNAME USER