Author: jow Date: 2016-01-14 15:27:20 +0100 (Thu, 14 Jan 2016) New Revision: 48237
Modified: branches/chaos_calmer/package/base-files/Makefile branches/chaos_calmer/package/base-files/files/etc/preinit branches/chaos_calmer/package/base-files/files/etc/profile branches/chaos_calmer/package/base-files/files/sbin/hotplug-call Log: CC: base-files: sanitize and unify $PATH Previously init and hotplug paths were different from console. Signed-off-by: Steven Barth <[email protected]> Backport of r47080 Modified: branches/chaos_calmer/package/base-files/Makefile =================================================================== --- branches/chaos_calmer/package/base-files/Makefile 2016-01-14 13:06:36 UTC (rev 48236) +++ branches/chaos_calmer/package/base-files/Makefile 2016-01-14 14:27:20 UTC (rev 48237) @@ -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)/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 Modified: branches/chaos_calmer/package/base-files/files/etc/preinit =================================================================== --- branches/chaos_calmer/package/base-files/files/etc/preinit 2016-01-14 13:06:36 UTC (rev 48236) +++ branches/chaos_calmer/package/base-files/files/etc/preinit 2016-01-14 14:27:20 UTC (rev 48237) @@ -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 @@ 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 Modified: branches/chaos_calmer/package/base-files/files/etc/profile =================================================================== --- branches/chaos_calmer/package/base-files/files/etc/profile 2016-01-14 13:06:36 UTC (rev 48236) +++ branches/chaos_calmer/package/base-files/files/etc/profile 2016-01-14 14:27:20 UTC (rev 48237) @@ -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\$ ' Modified: branches/chaos_calmer/package/base-files/files/sbin/hotplug-call =================================================================== --- branches/chaos_calmer/package/base-files/files/sbin/hotplug-call 2016-01-14 13:06:36 UTC (rev 48236) +++ branches/chaos_calmer/package/base-files/files/sbin/hotplug-call 2016-01-14 14:27:20 UTC (rev 48237) @@ -5,7 +5,7 @@ . /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 _______________________________________________ openwrt-commits mailing list [email protected] https://lists.openwrt.org/cgi-bin/mailman/listinfo/openwrt-commits
