Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
O
OpnSense
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Kulya
OpnSense
Commits
dac39c53
Commit
dac39c53
authored
Feb 26, 2017
by
Franco Fichtner
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
rc: bring back the early installer as optional importer
This sort of reverts commit
5f319ade
.
parent
974ff942
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
22 additions
and
2 deletions
+22
-2
rc.bootup
src/etc/rc.bootup
+21
-1
rc.installer
src/etc/rc.installer
+1
-1
No files found.
src/etc/rc.bootup
View file @
dac39c53
...
...
@@ -65,6 +65,26 @@ echo "done.\n";
*/
system_console_mute
();
/* loopback device is required early for syslog and the installer */
interfaces_loopback_configure
(
true
);
$setup_installer
=
is_install_media
();
if
(
$setup_installer
)
{
echo
'Press any key to start the configuration importer: '
;
$key
=
timeout
();
if
(
$key
!=
"
\n
"
)
{
echo
"
\n
"
;
}
if
(
isset
(
$key
))
{
passthru
(
'/usr/local/etc/rc.importer'
);
}
/* config may have changed via installer import */
OPNsense\Core\Config
::
getInstance
()
->
forceReload
();
}
global
$config
;
$config
=
parse_config
(
true
);
convert_config
();
...
...
@@ -138,7 +158,7 @@ if ($ipsec_dynamic_hosts) {
// generate configuration data for all installed templates
configd_run
(
'template reload *'
);
if
(
is_install_media
()
)
{
if
(
$setup_installer
)
{
/*
* Installer mode requires setting up an extra user and
* we will protect it with root's password. We can only
...
...
src/etc/rc.installer
View file @
dac39c53
...
...
@@ -79,4 +79,4 @@ for n in 5 4 3 2 1; do
done
echo
/usr/local/etc/rc.
reboot
reboot
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment