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
7abce1dc
Commit
7abce1dc
authored
Nov 14, 2016
by
Franco Fichtner
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
config: strip boot message conditionals from migration
(cherry picked from commit
18d46de7
)
parent
fb3d4ee0
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
0 additions
and
10 deletions
+0
-10
upgrade_config.inc
src/etc/inc/upgrade_config.inc
+0
-10
No files found.
src/etc/inc/upgrade_config.inc
View file @
7abce1dc
...
...
@@ -2067,8 +2067,6 @@ function upgrade_054_to_055()
$xmldump
=
"
{
$database
}
.old.xml"
;
$xmldumpnew
=
"
{
$database
}
.new.xml"
;
if
(
file_exists
(
"/var/run/booting"
))
echo
"Migrate RRD database
{
$database
}
to new format for IPv6
\n
"
;
mwexec
(
"
$rrdtool
tune
{
$rrddbpath
}{
$database
}
-r roundtrip:delay 2>&1"
);
dump_rrd_to_xml
(
"
{
$rrddbpath
}
/
{
$database
}
"
,
"/tmp/
{
$xmldump
}
"
);
...
...
@@ -2103,8 +2101,6 @@ function upgrade_054_to_055()
$xmldumptmp
=
"
{
$database
}
.tmp.xml"
;
$xmldumpnew
=
"
{
$database
}
.new.xml"
;
if
(
file_exists
(
"/var/run/booting"
))
echo
"Migrate RRD database
{
$database
}
to new format
\n
"
;
/* rename DS source */
mwexec
(
"
$rrdtool
tune
{
$rrddbpath
}
/
{
$database
}
-r in:inpass 2>&1"
);
mwexec
(
"
$rrdtool
tune
{
$rrddbpath
}
/
{
$database
}
-r out:outpass 2>71"
);
...
...
@@ -2620,9 +2616,6 @@ function upgrade_080_to_081()
$xmldump
=
"
{
$database
}
.old.xml"
;
$xmldumpnew
=
"
{
$database
}
.new.xml"
;
if
(
file_exists
(
"/var/run/booting"
))
echo
"Migrate RRD database
{
$database
}
to new format for IPv6.
\n
"
;
/* dump contents to xml and move database out of the way */
dump_rrd_to_xml
(
"
{
$rrddbpath
}
/
{
$database
}
"
,
"/tmp/
{
$xmldump
}
"
);
...
...
@@ -2956,9 +2949,6 @@ function upgrade_095_to_096()
$databases
=
return_dir_as_array
(
$rrddbpath
,
'/-(traffic|packets)\.rrd$/'
);
rsort
(
$databases
);
foreach
(
$databases
as
$database
)
{
if
(
file_exists
(
"/var/run/booting"
))
echo
"Update RRD database
{
$database
}
.
\n
"
;
$cmd
=
"
{
$rrdtool
}
tune
{
$rrddbpath
}
/
{
$database
}
"
;
foreach
(
$names
as
$name
)
$cmd
.=
" -a
{
$name
}
:
{
$stream
}
"
;
...
...
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