Land #26, Kali database.yml check for msfwrapper

rapid7 · Sep 18, 2015 · ba405f6 · ba405f6
2 parents dfda7c7 + 5e43136
commit ba405f6
Showing 1 changed file with 8 additions and 3 deletions.
diff --git a/config/templates/metasploit-framework-wrappers/msfwrapper.erb b/config/templates/metasploit-framework-wrappers/msfwrapper.erb
@@ -82,9 +82,14 @@ if [ -n "`find $FRAMEWORK/$cmd -mmin +20160`" ]; then
   echo " Consider running 'msfupdate' to update to the latest version."
 fi
 
-# Skip initialization if we're root
-if [ "`id -u`" -gt 0 ]; then
-  init
+# If we are on an updated Kali system, try to use the system database
+if [ -e /usr/share/metasploit-framework/config/database.yml \
+     -a ! -e $LOCALCONF/database.yml ]; then
+  cmd="$cmd -y /usr/share/metasploit-framework/config/database.yml"
+else # Skip initialization if we're root
+  if [ "`id -u`" -gt 0 ]; then
+    init
+  fi
 fi
 
 # Uncomment to enable libedit support