Commit 18d46de7 authored by Franco Fichtner's avatar Franco Fichtner

config: strip boot message conditionals from migration

parent ec92f844
...@@ -2067,8 +2067,6 @@ function upgrade_054_to_055() ...@@ -2067,8 +2067,6 @@ function upgrade_054_to_055()
$xmldump = "{$database}.old.xml"; $xmldump = "{$database}.old.xml";
$xmldumpnew = "{$database}.new.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"); mwexec("$rrdtool tune {$rrddbpath}{$database} -r roundtrip:delay 2>&1");
dump_rrd_to_xml("{$rrddbpath}/{$database}", "/tmp/{$xmldump}"); dump_rrd_to_xml("{$rrddbpath}/{$database}", "/tmp/{$xmldump}");
...@@ -2103,8 +2101,6 @@ function upgrade_054_to_055() ...@@ -2103,8 +2101,6 @@ function upgrade_054_to_055()
$xmldumptmp = "{$database}.tmp.xml"; $xmldumptmp = "{$database}.tmp.xml";
$xmldumpnew = "{$database}.new.xml"; $xmldumpnew = "{$database}.new.xml";
if (file_exists("/var/run/booting"))
echo "Migrate RRD database {$database} to new format \n";
/* rename DS source */ /* rename DS source */
mwexec("$rrdtool tune {$rrddbpath}/{$database} -r in:inpass 2>&1"); mwexec("$rrdtool tune {$rrddbpath}/{$database} -r in:inpass 2>&1");
mwexec("$rrdtool tune {$rrddbpath}/{$database} -r out:outpass 2>71"); mwexec("$rrdtool tune {$rrddbpath}/{$database} -r out:outpass 2>71");
...@@ -2620,9 +2616,6 @@ function upgrade_080_to_081() ...@@ -2620,9 +2616,6 @@ function upgrade_080_to_081()
$xmldump = "{$database}.old.xml"; $xmldump = "{$database}.old.xml";
$xmldumpnew = "{$database}.new.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 contents to xml and move database out of the way */
dump_rrd_to_xml("{$rrddbpath}/{$database}", "/tmp/{$xmldump}"); dump_rrd_to_xml("{$rrddbpath}/{$database}", "/tmp/{$xmldump}");
...@@ -2956,9 +2949,6 @@ function upgrade_095_to_096() ...@@ -2956,9 +2949,6 @@ function upgrade_095_to_096()
$databases = return_dir_as_array($rrddbpath, '/-(traffic|packets)\.rrd$/'); $databases = return_dir_as_array($rrddbpath, '/-(traffic|packets)\.rrd$/');
rsort($databases); rsort($databases);
foreach($databases as $database) { foreach($databases as $database) {
if (file_exists("/var/run/booting"))
echo "Update RRD database {$database}.\n";
$cmd = "{$rrdtool} tune {$rrddbpath}/{$database}"; $cmd = "{$rrdtool} tune {$rrddbpath}/{$database}";
foreach ($names as $name) foreach ($names as $name)
$cmd .= " -a {$name}:{$stream}"; $cmd .= " -a {$name}:{$stream}";
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment