diff options
| author | Jo-Philipp Wich <jow@openwrt.org> | 2016-01-14 14:27:20 +0000 |
|---|---|---|
| committer | Jo-Philipp Wich <jow@openwrt.org> | 2016-01-14 14:27:20 +0000 |
| commit | c9b6e631f87656dc5597be3fde75e37f421b9714 (patch) | |
| tree | 8b709b05ae73a9cd3c53f2901e21c2a0ab0af5fd | |
| parent | 33926ccf4d2bd7299b389ddeb3b0627e34103ab0 (diff) | |
| download | upstream-c9b6e631f87656dc5597be3fde75e37f421b9714.tar.gz upstream-c9b6e631f87656dc5597be3fde75e37f421b9714.tar.bz2 upstream-c9b6e631f87656dc5597be3fde75e37f421b9714.zip | |
CC: base-files: sanitize and unify $PATH
Previously init and hotplug paths were different from console.
Signed-off-by: Steven Barth <steven@midlink.org>
Backport of r47080
git-svn-id: svn://svn.openwrt.org/openwrt/branches/chaos_calmer@48237 3c298f89-4303-0410-b956-a3cf2f4a3e73
| -rw-r--r-- | package/base-files/Makefile | 4 | ||||
| -rwxr-xr-x | package/base-files/files/etc/preinit | 4 | ||||
| -rw-r--r-- | package/base-files/files/etc/profile | 2 | ||||
| -rwxr-xr-x | package/base-files/files/sbin/hotplug-call | 2 |
4 files changed, 6 insertions, 6 deletions
diff --git a/package/base-files/Makefile b/package/base-files/Makefile index 0bba313702..5474265b1c 100644 --- a/package/base-files/Makefile +++ b/package/base-files/Makefile @@ -1,5 +1,5 @@ # -# Copyright (C) 2007-2014 OpenWrt.org +# Copyright (C) 2007-2016 OpenWrt.org # Copyright (C) 2010 Vertical Communications # # This is free software, licensed under the GNU General Public License v2. @@ -11,7 +11,7 @@ include $(INCLUDE_DIR)/kernel.mk include $(INCLUDE_DIR)/version.mk PKG_NAME:=base-files -PKG_RELEASE:=157 +PKG_RELEASE:=157.1 PKG_FILE_DEPENDS:=$(PLATFORM_DIR)/ $(GENERIC_PLATFORM_DIR)/base-files/ PKG_BUILD_DEPENDS:=opkg/host usign/host diff --git a/package/base-files/files/etc/preinit b/package/base-files/files/etc/preinit index 9cc8a9a8f6..31f861edf9 100755 --- a/package/base-files/files/etc/preinit +++ b/package/base-files/files/etc/preinit @@ -4,7 +4,7 @@ [ -z "$PREINIT" ] && exec /sbin/init -export PATH=/bin:/sbin:/usr/bin:/usr/sbin +export PATH=/usr/sbin:/usr/bin:/sbin:/bin pi_ifname= pi_ip=192.168.1.1 @@ -20,7 +20,7 @@ fs_failsafe_wait_timeout=2 pi_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" . /lib/functions.sh diff --git a/package/base-files/files/etc/profile b/package/base-files/files/etc/profile index 3dd58e14f2..170f487833 100644 --- a/package/base-files/files/etc/profile +++ b/package/base-files/files/etc/profile @@ -2,7 +2,7 @@ [ -f /etc/banner ] && cat /etc/banner [ -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=${HOME:-/root} export PS1='\u@\h:\w\$ ' diff --git a/package/base-files/files/sbin/hotplug-call b/package/base-files/files/sbin/hotplug-call index 260be0b7a4..743871a3ff 100755 --- a/package/base-files/files/sbin/hotplug-call +++ b/package/base-files/files/sbin/hotplug-call @@ -5,7 +5,7 @@ export HOTPLUG_TYPE="$1" . /lib/functions.sh -PATH=/bin:/sbin:/usr/bin:/usr/sbin +PATH=/usr/sbin:/usr/bin:/sbin:/bin LOGNAME=root USER=root export PATH LOGNAME USER |