From 078c5aa14b97c26754c37862b8ea331aa84c9c89 Mon Sep 17 00:00:00 2001 From: Dmitry Smirnov Date: Mon, 6 Apr 2015 18:29:48 +1000 Subject: [PATCH 1/2] Briefly document "--migrate-events" option in zmupdate.pl (#783). Signed-off-by: Dmitry Smirnov --- scripts/zmupdate.pl.in | 1 + 1 file changed, 1 insertion(+) diff --git a/scripts/zmupdate.pl.in b/scripts/zmupdate.pl.in index 2650ba812..522f211ec 100644 --- a/scripts/zmupdate.pl.in +++ b/scripts/zmupdate.pl.in @@ -39,6 +39,7 @@ configuring upgrades etc, including on the fly upgrades. -c, --check - Check for updated versions of ZoneMinder -f, --freshen - Freshen the configuration in the database. Equivalent of old zmconfig.pl -noi + --migrate-events - Update database structures as per USE_DEEP_STORAGE setting. -v, --version= - Force upgrade to the current version from -u, --user= - Alternate DB user with privileges to alter DB -p, --pass= - Password of alternate DB user with privileges to alter DB From 904f2989ed44e12a2aa854edfd12bb6cb838a019 Mon Sep 17 00:00:00 2001 From: Dmitry Smirnov Date: Mon, 6 Apr 2015 18:16:02 +1000 Subject: [PATCH 2/2] Improving ZM_USE_DEEP_STORAGE description (#783): Removed "If you are upgrading from a previous version of ZoneMinder" from description. From data loss prospective it is irrelevant whether database is upgraded or not as fresh install is just as vulnerable. Changed "enable" to "change" to emphasize the above. Signed-off-by: Dmitry Smirnov --- scripts/ZoneMinder/lib/ZoneMinder/ConfigData.pm.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/ZoneMinder/lib/ZoneMinder/ConfigData.pm.in b/scripts/ZoneMinder/lib/ZoneMinder/ConfigData.pm.in index f3c53dac3..4235a1398 100644 --- a/scripts/ZoneMinder/lib/ZoneMinder/ConfigData.pm.in +++ b/scripts/ZoneMinder/lib/ZoneMinder/ConfigData.pm.in @@ -181,7 +181,7 @@ our @options = name => "ZM_USE_DEEP_STORAGE", default => "yes", description => "Use a deep filesystem hierarchy for events", - help => "This option is now the default for new ZoneMinder systems and should not be changed. Previous versions of ZoneMinder stored all events for a monitor under one folder. Enabling USE_DEEP_STORAGE causes ZoneMinder to store events under a folder structure that follows year/month/day/hour/min/second. Storing events this way avoids the limitation of storing more than 32k files in a single folder inherent in some filesystems. If you are upgrading from a previous version of ZoneMinder, it is important to note that you cannot simply enable this option. You must stop zoneminder, enable USE_DEEP_STORAGE, and then run \"sudo zmupdate.pl --migrate-events\". FAILURE TO DO SO WILL RESULT IN LOSS OF YOUR DATA! Consult the ZoneMinder WiKi for further details.", + help => "This option is now the default for new ZoneMinder systems and should not be changed. Previous versions of ZoneMinder stored all events for a monitor under one folder. Enabling USE_DEEP_STORAGE causes ZoneMinder to store events under a folder structure that follows year/month/day/hour/min/second. Storing events this way avoids the limitation of storing more than 32k files in a single folder inherent in some filesystems. It is important to note that you cannot simply change this option. You must stop zoneminder, enable USE_DEEP_STORAGE, and then run \"sudo zmupdate.pl --migrate-events\". FAILURE TO DO SO WILL RESULT IN LOSS OF YOUR DATA! Consult the ZoneMinder WiKi for further details.", type => $types{boolean}, category => "paths", },