Move options to lib

Author: Meatballs1

lib/msf/core/exploit/powershell.rb

@@ -6,10 +6,12 @@ module Exploit::Powershell
 
 	def initialize(info = {})
 		super
-		register_advanced_options(
+		register_options(
 			[
+                        	OptBool.new('PERSIST', [true, 'Run the payload in a loop', false]),
+                        	OptBool.new('PSH_OLD_METHOD', [true, 'Use powershell 1.0', false]),
 				OptBool.new('RUN_WOW64', [
-					false,
+					true,
 					'Execute powershell in 32bit compatibility mode, payloads need native arch',
 					false
 						]),
@@ -129,7 +131,7 @@ def run_hidden_psh(ps_code,ps_bin='powershell.exe')
 	#
 	# Creates cmd script to execute psh payload
 	#
-	def cmd_psh_payload(pay, old_psh=false)
+	def cmd_psh_payload(pay, old_psh=datastore['PSH_OLD_METHOD'])
 		# Allow powershell 1.0 format
 		if old_psh
 			psh_payload = Msf::Util::EXE.to_win32pe_psh(framework, pay)

modules/exploits/windows/smb/psexec_psh.rb

@@ -68,11 +68,6 @@ def initialize(info = {})
 				[ 'URL', 'http://technet.microsoft.com/en-us/sysinternals/bb897553.aspx' ]
 			]
 		))
-
-		register_options([
-			OptBool.new('PERSIST', [false, 'Run the payload in a loop']),
-			OptBool.new('PSH_OLD_METHOD', [false, 'Use powershell 1.0', false]),
-		], self.class)
 	end