Author: jow Date: 2016-01-14 15:27:23 +0100 (Thu, 14 Jan 2016) New Revision: 48238
Modified: branches/chaos_calmer/package/base-files/Makefile branches/chaos_calmer/package/base-files/image-config.in Log: CC: base-files: use the correct path in case of modified preinit options If the user sets any preinit options in .config, the wrong path may get applied due to wrong default value in image-config.in and due to Makefile writing also the unchanged options into 00_preinit.conf Modify the default path in image-config.in to match the current default path set by r47080. Also modify the fall-back default in Makefile. Signed-off-by: Hannu Nyman <[email protected]> Backport of r47590 Modified: branches/chaos_calmer/package/base-files/Makefile =================================================================== --- branches/chaos_calmer/package/base-files/Makefile 2016-01-14 14:27:20 UTC (rev 48237) +++ branches/chaos_calmer/package/base-files/Makefile 2016-01-14 14:27:23 UTC (rev 48238) @@ -11,7 +11,7 @@ include $(INCLUDE_DIR)/version.mk PKG_NAME:=base-files -PKG_RELEASE:=157.1 +PKG_RELEASE:=157.2 PKG_FILE_DEPENDS:=$(PLATFORM_DIR)/ $(GENERIC_PLATFORM_DIR)/base-files/ PKG_BUILD_DEPENDS:=opkg/host usign/host @@ -67,7 +67,7 @@ mkdir -p $(1)/lib/preinit echo 'pi_suppress_stderr="$(CONFIG_TARGET_PREINIT_SUPPRESS_STDERR)"' >$(1)/lib/preinit/00_preinit.conf echo 'fs_failsafe_wait_timeout=$(if $(CONFIG_TARGET_PREINIT_TIMEOUT),$(CONFIG_TARGET_PREINIT_TIMEOUT),2)' >>$(1)/lib/preinit/00_preinit.conf - echo 'pi_init_path=$(if $(CONFIG_TARGET_INIT_PATH),$(CONFIG_TARGET_INIT_PATH),"/bin:/sbin:/usr/bin:/usr/sbin")' >>$(1)/lib/preinit/00_preinit.conf + echo 'pi_init_path=$(if $(CONFIG_TARGET_INIT_PATH),$(CONFIG_TARGET_INIT_PATH),"/usr/sbin:/usr/bin:/sbin:/bin")' >>$(1)/lib/preinit/00_preinit.conf echo 'pi_init_env=$(if $(CONFIG_TARGET_INIT_ENV),$(CONFIG_TARGET_INIT_ENV),"")' >>$(1)/lib/preinit/00_preinit.conf echo 'pi_init_cmd=$(if $(CONFIG_TARGET_INIT_CMD),$(CONFIG_TARGET_INIT_CMD),"/sbin/init")' >>$(1)/lib/preinit/00_preinit.conf echo 'pi_init_suppress_stderr="$(CONFIG_TARGET_INIT_SUPPRESS_STDERR)"' >>$(1)/lib/preinit/00_preinit.conf Modified: branches/chaos_calmer/package/base-files/image-config.in =================================================================== --- branches/chaos_calmer/package/base-files/image-config.in 2016-01-14 14:27:20 UTC (rev 48237) +++ branches/chaos_calmer/package/base-files/image-config.in 2016-01-14 14:27:23 UTC (rev 48238) @@ -99,7 +99,7 @@ config TARGET_INIT_PATH string prompt "PATH for regular boot" if INITOPT - default "/bin:/sbin:/usr/bin:/usr/sbin" + default "/usr/sbin:/usr/bin:/sbin:/bin" help Default PATH used during normal operation _______________________________________________ openwrt-commits mailing list [email protected] https://lists.openwrt.org/cgi-bin/mailman/listinfo/openwrt-commits
