Merge pull request #791 from onlyjob/783

#783 - related corrections
This commit is contained in:
Andrew Bauer 2015-04-06 07:05:40 -05:00
commit 8e5ba94ff8
2 changed files with 2 additions and 1 deletions

View File

@ -181,7 +181,7 @@ our @options =
name => "ZM_USE_DEEP_STORAGE", name => "ZM_USE_DEEP_STORAGE",
default => "yes", default => "yes",
description => "Use a deep filesystem hierarchy for events", 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}, type => $types{boolean},
category => "paths", category => "paths",
}, },

View File

@ -39,6 +39,7 @@ configuring upgrades etc, including on the fly upgrades.
-c, --check - Check for updated versions of ZoneMinder -c, --check - Check for updated versions of ZoneMinder
-f, --freshen - Freshen the configuration in the database. Equivalent of old zmconfig.pl -noi -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>, --version=<version> - Force upgrade to the current version from <version> -v<version>, --version=<version> - Force upgrade to the current version from <version>
-u<dbuser>, --user=<dbuser> - Alternate DB user with privileges to alter DB -u<dbuser>, --user=<dbuser> - Alternate DB user with privileges to alter DB
-p<dbpass>, --pass=<dbpass> - Password of alternate DB user with privileges to alter DB -p<dbpass>, --pass=<dbpass> - Password of alternate DB user with privileges to alter DB