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
044d519f
Commit
044d519f
authored
May 11, 2017
by
Franco Fichtner
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
config: change migration a tiny bit
parent
0f551f09
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
10 additions
and
4 deletions
+10
-4
rc.bootup
src/etc/rc.bootup
+7
-1
run_migrations.php
src/opnsense/mvc/script/run_migrations.php
+3
-3
No files found.
src/etc/rc.bootup
View file @
044d519f
...
...
@@ -56,7 +56,13 @@ foreach ($inc_files as $inc_file) {
echo
"done.
\n
"
;
convert_config
(
true
);
/*
* If this was an import or restore or reset, once run
* the migration, but do not display the status here as
* otherwise this prints all the models that keep their
* current version level.
*/
convert_config
();
/*
* Now mute console messages from kernel for this script, it
...
...
src/opnsense/mvc/script/run_migrations.php
View file @
044d519f
...
...
@@ -50,14 +50,14 @@ foreach (new RecursiveIteratorIterator(new RecursiveDirectoryIterator($model_dir
$version_post
=
$mdl
->
getVersion
();
if
(
$version_pre
!=
$version_post
)
{
$version_pre
=
!
empty
(
$version_pre
)
?
$version_pre
:
' <unversioned> '
;
echo
"
m
igrated "
.
$mdl_class_info
->
getName
()
.
echo
"
M
igrated "
.
$mdl_class_info
->
getName
()
.
" from "
.
$version_pre
.
" to "
.
$version_post
.
"
\n
"
;
$executed_migration
=
true
;
}
elseif
(
!
empty
(
$version_post
))
{
echo
"
k
eep version "
.
$mdl_class_info
->
getName
()
.
" ("
.
$version_post
.
")
\n
"
;
echo
"
K
eep version "
.
$mdl_class_info
->
getName
()
.
" ("
.
$version_post
.
")
\n
"
;
}
else
{
echo
"
u
nversioned "
.
$mdl_class_info
->
getName
()
.
"
\n
"
;
echo
"
U
nversioned "
.
$mdl_class_info
->
getName
()
.
"
\n
"
;
}
}
}
catch
(
\ReflectionException
$e
)
{
...
...
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