mr/openwrt
2
0
Fork 1
Code Issues 7 Pull Requests Releases Wiki Activity

preinit: use only the image config options

Browse Source 
The pi_* variables and the fs_failsafe_wait_timeout variable are set by
the CONFIG_TARGET_PREINIT_* config options. No need to maintain the same
values twice.

All other fs_ variables were never used.

Signed-off-by: Mathias Kresin <dev@kresin.me>
This commit is contained in:
Mathias Kresin 2016-08-07 22:21:34 +02:00 committed by John Crispin
parent 14e0f057c8
commit 5fadd4397b
2 changed files with 0 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
package/base-files/Makefile
View File

@ -64,7 +64,6 @@ define Package/base-files/description
This package contains a base filesystem and system scripts for OpenWrt. This package contains a base filesystem and system scripts for OpenWrt.
endef endef
ifneq ($(CONFIG_PREINITOPT),)
define ImageConfigOptions define ImageConfigOptions
mkdir -p $(1)/lib/preinit mkdir -p $(1)/lib/preinit
echo 'pi_suppress_stderr="$(CONFIG_TARGET_PREINIT_SUPPRESS_STDERR)"' >$(1)/lib/preinit/00_preinit.conf echo 'pi_suppress_stderr="$(CONFIG_TARGET_PREINIT_SUPPRESS_STDERR)"' >$(1)/lib/preinit/00_preinit.conf
@ -81,7 +80,6 @@ define ImageConfigOptions
echo 'pi_preinit_no_failsafe_netmsg="$(CONFIG_TARGET_PREINIT_SUPPRESS_FAILSAFE_NETMSG)"' >>$(1)/lib/preinit/00_preinit.conf echo 'pi_preinit_no_failsafe_netmsg="$(CONFIG_TARGET_PREINIT_SUPPRESS_FAILSAFE_NETMSG)"' >>$(1)/lib/preinit/00_preinit.conf
echo 'pi_preinit_no_failsafe="$(CONFIG_TARGET_PREINIT_DISABLE_FAILSAFE)"' >>$(1)/lib/preinit/00_preinit.conf echo 'pi_preinit_no_failsafe="$(CONFIG_TARGET_PREINIT_DISABLE_FAILSAFE)"' >>$(1)/lib/preinit/00_preinit.conf
endef endef
endif
define Build/Prepare define Build/Prepare
mkdir -p $(PKG_BUILD_DIR) mkdir -p $(PKG_BUILD_DIR)

17
package/base-files/files/etc/preinit
View File

@ -6,23 +6,6 @@
export PATH="%PATH%" export PATH="%PATH%"
pi_ifname=
pi_ip=192.168.1.1
pi_broadcast=192.168.1.255
pi_netmask=255.255.255.0
fs_failsafe_ifname=
fs_failsafe_ip=192.168.1.1
fs_failsafe_broadcast=192.168.1.255
fs_failsafe_netmask=255.255.255.0
fs_failsafe_wait_timeout=2
pi_suppress_stderr="y"
pi_init_suppress_stderr="y"
pi_init_path="%PATH%"
pi_init_cmd="/sbin/init"
. /lib/functions.sh . /lib/functions.sh
. /lib/functions/preinit.sh . /lib/functions/preinit.sh
. /lib/functions/system.sh . /lib/functions/system.sh