diff options
| author | Jo-Philipp Wich <jow@openwrt.org> | 2016-01-14 14:27:23 +0000 |
|---|---|---|
| committer | Jo-Philipp Wich <jow@openwrt.org> | 2016-01-14 14:27:23 +0000 |
| commit | ccf3d32f8847a5426aba132c0860761009c90441 (patch) | |
| tree | 3a56e6e624922583fa072de15db066d0e74661bd /package/base-files | |
| parent | c9b6e631f87656dc5597be3fde75e37f421b9714 (diff) | |
| download | upstream-ccf3d32f8847a5426aba132c0860761009c90441.tar.gz upstream-ccf3d32f8847a5426aba132c0860761009c90441.tar.bz2 upstream-ccf3d32f8847a5426aba132c0860761009c90441.zip | |
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 <hannu.nyman@iki.fi>
Backport of r47590
git-svn-id: svn://svn.openwrt.org/openwrt/branches/chaos_calmer@48238 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'package/base-files')
| -rw-r--r-- | package/base-files/Makefile | 4 | ||||
| -rw-r--r-- | package/base-files/image-config.in | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/package/base-files/Makefile b/package/base-files/Makefile index 5474265b1c..9f6810f4d8 100644 --- a/package/base-files/Makefile +++ b/package/base-files/Makefile @@ -11,7 +11,7 @@ include $(INCLUDE_DIR)/kernel.mk 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 @@ define ImageConfigOptions 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 diff --git a/package/base-files/image-config.in b/package/base-files/image-config.in index fd0ead6236..495300d839 100644 --- a/package/base-files/image-config.in +++ b/package/base-files/image-config.in @@ -99,7 +99,7 @@ menuconfig INITOPT 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 |