diff options
| author | Jo-Philipp Wich <jow@openwrt.org> | 2016-02-08 14:28:50 +0000 |
|---|---|---|
| committer | Jo-Philipp Wich <jow@openwrt.org> | 2016-02-08 14:28:50 +0000 |
| commit | cc289e0adb936bf350db2037544d7eb8e5b084c3 (patch) | |
| tree | 5c91d58a6b92f380989cf4a68bd38b1807e308ea /package/base-files/files | |
| parent | a8936bde1f21ce12ca85a0585eed0a2392180221 (diff) | |
| download | upstream-cc289e0adb936bf350db2037544d7eb8e5b084c3.tar.gz upstream-cc289e0adb936bf350db2037544d7eb8e5b084c3.tar.bz2 upstream-cc289e0adb936bf350db2037544d7eb8e5b084c3.zip | |
base-files: honor CONFIG_TARGET_INIT_PATH
Signed-off-by: Jo-Philipp Wich <jow@openwrt.org>
SVN-Revision: 48678
Diffstat (limited to 'package/base-files/files')
| -rwxr-xr-x | package/base-files/files/etc/preinit | 6 | ||||
| -rw-r--r-- | package/base-files/files/etc/profile | 2 | ||||
| -rwxr-xr-x | package/base-files/files/sbin/hotplug-call | 4 |
3 files changed, 6 insertions, 6 deletions
diff --git a/package/base-files/files/etc/preinit b/package/base-files/files/etc/preinit index 31f861edf9..181b332f14 100755 --- a/package/base-files/files/etc/preinit +++ b/package/base-files/files/etc/preinit @@ -1,10 +1,10 @@ #!/bin/sh -# Copyright (C) 2006 OpenWrt.org +# Copyright (C) 2006-2016 OpenWrt.org # Copyright (C) 2010 Vertical Communications [ -z "$PREINIT" ] && exec /sbin/init -export PATH=/usr/sbin:/usr/bin:/sbin:/bin +export PATH="%PATH%" 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="/usr/sbin:/usr/bin:/sbin:/bin" +pi_init_path="%PATH%" 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 8a55fecb37..ad8fe12b66 100644 --- a/package/base-files/files/etc/profile +++ b/package/base-files/files/etc/profile @@ -6,7 +6,7 @@ fgrep -sq '/ overlay ro,' /proc/mounts && { echo 'Please try to remove files from /overlay/upper/... and reboot!' } -export PATH=/usr/sbin:/usr/bin:/sbin:/bin +export PATH="%PATH%" 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 743871a3ff..28e957c398 100755 --- a/package/base-files/files/sbin/hotplug-call +++ b/package/base-files/files/sbin/hotplug-call @@ -1,11 +1,11 @@ #!/bin/sh -# Copyright (C) 2006-2010 OpenWrt.org +# Copyright (C) 2006-2016 OpenWrt.org export HOTPLUG_TYPE="$1" . /lib/functions.sh -PATH=/usr/sbin:/usr/bin:/sbin:/bin +PATH="%PATH%" LOGNAME=root USER=root export PATH LOGNAME USER |