Allow SkipDatabaseInit to be passed to new consoles to skip over DB initialization. Combined with r14161 this fixes #5902 by allowing this option to be passed down
git-svn-id: file:///home/svn/framework3/trunk@14164 4d416f70-5f16-0410-b530-b9f4589650daunstable
parent
0658d8068b
commit
cd3c3daae1
|
@ -120,6 +120,7 @@ class Driver < Msf::Ui::Driver
|
|||
print_error("***")
|
||||
end
|
||||
|
||||
|
||||
# Add the database dispatcher if it is usable
|
||||
if (framework.db.usable)
|
||||
require 'msf/ui/console/command_dispatcher/db'
|
||||
|
@ -168,7 +169,7 @@ class Driver < Msf::Ui::Driver
|
|||
end
|
||||
|
||||
# Parse any specified database.yml file
|
||||
if framework.db.usable
|
||||
if framework.db.usable and not opts['SkipDatabaseInit']
|
||||
# Look for our database configuration in the following places, in order:
|
||||
# command line arguments
|
||||
# environment variable
|
||||
|
|
Loading…
Reference in New Issue