diff options
| author | smos <seth.mos@dds.nl> | 2011-10-26 08:45:21 +0200 |
|---|---|---|
| committer | smos <seth.mos@dds.nl> | 2011-10-26 08:45:21 +0200 |
| commit | 4fe54cdf04d7c79c47f5df3695285f102c2df6ec (patch) | |
| tree | 4fe1e193c0044f00c802c01c51d1985d67b1f1a9 | |
| parent | b0b48a57c9f22b2f65702c22a4c607b8cbda6487 (diff) | |
| download | pfsense-4fe54cdf04d7c79c47f5df3695285f102c2df6ec.zip pfsense-4fe54cdf04d7c79c47f5df3695285f102c2df6ec.tar.gz | |
Add back the accidentally removed xml rrd restore line, otherwise we still don't have the new RRD file
Ticket #1758
| -rw-r--r-- | etc/inc/upgrade_config.inc | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/etc/inc/upgrade_config.inc b/etc/inc/upgrade_config.inc index 9e4c6b9..8878f95 100644 --- a/etc/inc/upgrade_config.inc +++ b/etc/inc/upgrade_config.inc @@ -2055,6 +2055,8 @@ function upgrade_054_to_055() { $rrdxmlarray = migrate_rrd_format($rrdold, $rrdnew); file_put_contents("{$g['tmp_path']}/{$xmldumpnew}", dump_xml_config_raw($rrdxmlarray, "rrd")); + mwexec("$rrdtool restore -f {$g['tmp_path']}/{$xmldumpnew} {$rrddbpath}/{$database} 2>&1"); + /* we now have the rrd with the new fields, adjust the size now. */ /* RRA 2 is 60 minutes, RRA 3 is 720 minutes */ mwexec("/bin/sync"); |
