Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
mirrors
openwrt
openwrt
提交
b4e33a1c
O
openwrt
项目概览
mirrors
/
openwrt
/
openwrt
大约 1 年 前同步成功
通知
7
Star
2
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
DevOps
流水线
流水线任务
计划
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
O
openwrt
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
DevOps
DevOps
流水线
流水线任务
计划
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
流水线任务
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
b4e33a1c
编写于
4月 19, 2016
作者:
J
John Crispin
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
base-files: Allow to disable failsafe mode
Signed-off-by:
N
Daniel Dickinson
<
openwrt@daniel.thecshore.com
>
上级
dc929174
变更
5
隐藏空白更改
内联
并排
Showing
5 changed file
with
24 addition
and
6 deletion
+24
-6
package/base-files/Makefile
package/base-files/Makefile
+2
-1
package/base-files/files/lib/preinit/10_indicate_failsafe
package/base-files/files/lib/preinit/10_indicate_failsafe
+1
-0
package/base-files/files/lib/preinit/30_failsafe_wait
package/base-files/files/lib/preinit/30_failsafe_wait
+5
-1
package/base-files/files/lib/preinit/40_run_failsafe_hook
package/base-files/files/lib/preinit/40_run_failsafe_hook
+1
-0
package/base-files/image-config.in
package/base-files/image-config.in
+15
-4
未找到文件。
package/base-files/Makefile
浏览文件 @
b4e33a1c
...
...
@@ -18,7 +18,7 @@ PKG_FILE_DEPENDS:=$(PLATFORM_DIR)/ $(GENERIC_PLATFORM_DIR)/base-files/
PKG_BUILD_DEPENDS
:=
usign/host
PKG_LICENSE
:=
GPL-2.0
PKG_CONFIG_DEPENDS
:=
CONFIG_SIGNED_PACKAGES CONFIG_TARGET_INIT_PATH
PKG_CONFIG_DEPENDS
:=
CONFIG_SIGNED_PACKAGES CONFIG_TARGET_INIT_PATH
CONFIG_TARGET_PREINIT_DISABLE_FAILSAFE
include
$(INCLUDE_DIR)/package.mk
...
...
@@ -82,6 +82,7 @@ define ImageConfigOptions
echo
'pi_broadcast=$(if $(CONFIG_TARGET_PREINIT_BROADCAST),$(CONFIG_TARGET_PREINIT_BROADCAST),"192.168.1.255")'
>>$(1)/lib/preinit/00_preinit.conf
echo
'pi_preinit_net_messages="$(CONFIG_TARGET_PREINIT_SHOW_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
endef
endif
...
...
package/base-files/files/lib/preinit/10_indicate_failsafe
浏览文件 @
b4e33a1c
...
...
@@ -9,6 +9,7 @@ indicate_failsafe_led () {
}
indicate_failsafe
()
{
[
"
$pi_preinit_no_failsafe
"
=
"y"
]
&&
return
echo
"- failsafe -"
preinit_net_echo
"Entering Failsafe!
\n
"
indicate_failsafe_led
...
...
package/base-files/files/lib/preinit/30_failsafe_wait
浏览文件 @
b4e33a1c
...
...
@@ -39,7 +39,7 @@ fs_wait_for_key () {
rm
-f
$keypress_wait
}
&
echo
"Press the [
$1
] key and hit [enter]
$2
"
[
"
$pi_preinit_no_failsafe
"
!=
"y"
]
&&
echo
"Press the [
$1
] key and hit [enter]
$2
"
echo
"Press the [1], [2], [3] or [4] key and hit [enter] to select the debug level"
# if we're on the console we wait for input
{
...
...
@@ -82,6 +82,10 @@ fs_wait_for_key () {
failsafe_wait
()
{
FAILSAFE
=
[
"
$pi_preinit_no_failsafe
"
==
"y"
]
&&
{
fs_wait_for_key
""
""
$fs_failsafe_wait_timeout
return
}
grep
-q
'failsafe='
/proc/cmdline
&&
FAILSAFE
=
true
&&
export
FAILSAFE
if
[
"
$FAILSAFE
"
!=
"true"
]
;
then
pi_failsafe_net_message
=
true
...
...
package/base-files/files/lib/preinit/40_run_failsafe_hook
浏览文件 @
b4e33a1c
...
...
@@ -3,6 +3,7 @@
# Copyright (C) 2010 Vertical Communications
run_failsafe_hook
()
{
[
"
$pi_preinit_no_failsafe
"
=
"y"
]
&&
return
if
[
"
$FAILSAFE
"
=
"true"
]
;
then
boot_run_hook failsafe
lock
-w
/tmp/.failsafe
...
...
package/base-files/image-config.in
浏览文件 @
b4e33a1c
...
...
@@ -24,13 +24,24 @@ config TARGET_PREINIT_SUPPRESS_STDERR
the ash shell launched by inittab will display stderr). That's
the same behaviour as seen in previous version of OpenWrt.
config TARGET_PREINIT_DISABLE_FAILSAFE
bool
prompt "Disable failsafe" if PREINITOPT
default n
help
Disable failsafe mode. While it is very handy while
experimenting or developing it really ought to be
disabled in production environments as it is a major
security loophole.
config TARGET_PREINIT_TIMEOUT
int
prompt "Failsafe wait timeout" if PREINITOPT
prompt "Failsafe
/Debug
wait timeout" if PREINITOPT
default 2
help
How long to wait for failsafe mode to be entered before
continuing with a regular boot if failsafe not selected.
How long to wait for failsafe mode to be entered or for
a debug option to be pressed before continuing with a
regular boot.
config TARGET_PREINIT_SHOW_NETMSG
bool
...
...
@@ -45,7 +56,7 @@ config TARGET_PREINIT_SHOW_NETMSG
config TARGET_PREINIT_SUPPRESS_FAILSAFE_NETMSG
bool
prompt "Suppress network message indicating failsafe" if
PREINITOPT
prompt "Suppress network message indicating failsafe" if
( PREINITOPT && !TARGET_PREINIT_SHOW_NETMSG && !TARGET_PREINIT_DISABLE_FAILSAFE )
default n
help
If "Show all preinit network messages" above is not set, then
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录