Changeset 42445 in vbox
- Timestamp:
- Jul 30, 2012 12:55:12 PM (13 years ago)
- svn:sync-xref-src-repo-rev:
- 79575
- Location:
- trunk
- Files:
-
- 5 edited
-
doc/manual/en_US/user_VBoxManage.xml (modified) (11 diffs)
-
src/VBox/Frontends/VBoxManage/VBoxManageControlVM.cpp (modified) (4 diffs)
-
src/VBox/Frontends/VBoxManage/VBoxManageGuestCtrl.cpp (modified) (2 diffs)
-
src/VBox/Frontends/VBoxManage/VBoxManageHelp.cpp (modified) (4 diffs)
-
src/VBox/Frontends/VBoxManage/VBoxManageModifyVM.cpp (modified) (1 diff)
Legend:
- Unmodified
- Added
- Removed
-
trunk/doc/manual/en_US/user_VBoxManage.xml
r41878 r42445 1394 1394 <listitem> 1395 1395 <para><computeroutput>VBoxManage controlvm <vm> teleport 1396 --hostname <name> --port <port> [--password 1397 <password>]</computeroutput> makes the machine the source of a 1398 teleporting operation and initiates a teleport to the given target. 1399 See <xref linkend="teleporting" /> for an introduction. If the 1400 optional password is specified, it must match the password that was 1401 given to the <computeroutput>modifyvm</computeroutput> command for 1402 the target machine; see <xref 1403 linkend="vboxmanage-modifyvm-teleport" /> for details.</para> 1396 --hostname <name> --port <port> [--passwordfile 1397 <file> | --password <password>]</computeroutput> makes 1398 the machine the source of a teleporting operation and initiates a 1399 teleport to the given target. See <xref linkend="teleporting" /> for 1400 an introduction. If the optional password is specified, it must match 1401 the password that was given to the 1402 <computeroutput>modifyvm</computeroutput> command for the target 1403 machine; see <xref linkend="vboxmanage-modifyvm-teleport" /> for 1404 details.</para> 1404 1405 </listitem> 1405 1406 </itemizedlist></para> … … 2603 2604 2604 2605 <screen>VBoxManage guestcontrol <vmname>|<uuid> exec[ute] 2605 --image <path to program> 2606 --username <name> [--password <password>] 2607 [--dos2unix] 2606 --image <path to program> --username <name> 2607 [--passwordfile <file> | --password <password>] 2608 2608 [--environment "<NAME>=<VALUE> [<NAME>=<VALUE>]"] 2609 [-- timeout <msec>] [--unix2dos] [--verbose]2609 [--verbose] [--timeout <msec>] 2610 2610 [--wait-exit] [--wait-stdout] [--wait-stderr] 2611 [--dos2unix] [--unix2dos] 2611 2612 -- [[<argument1>] ... [<argumentN>]]</screen> 2612 2613 … … 2636 2637 <para>Name of the user the process should run under. This 2637 2638 user must exist on the guest OS.</para> 2639 </glossdef> 2640 </glossentry> 2641 2642 <glossentry> 2643 <glossterm>--passwordfile <file></glossterm> 2644 2645 <glossdef> 2646 <para>Password of the user account specified to be read from 2647 the given file. If not given, an empty password is 2648 assumed.</para> 2638 2649 </glossdef> 2639 2650 </glossentry> … … 2758 2769 information.</para> 2759 2770 </note> Examples: <screen>VBoxManage --nologo guestcontrol "My VM" execute --image "/bin/ls" 2760 --username foo --password bar--wait-exit --wait-stdout -- -l /usr</screen> <screen>VBoxManage --nologo guestcontrol "My VM" execute --image "c:\\windows\\system32\\ipconfig.exe"2761 --username foo --password bar--wait-exit --wait-stdout</screen> Note that2771 --username foo --passwordfile bar.txt --wait-exit --wait-stdout -- -l /usr</screen> <screen>VBoxManage --nologo guestcontrol "My VM" execute --image "c:\\windows\\system32\\ipconfig.exe" 2772 --username foo --passwordfile bar.txt --wait-exit --wait-stdout</screen> Note that 2762 2773 the double backslashes in the second example are only required on 2763 2774 Unix hosts.</para> … … 2794 2805 2795 2806 <screen>VBoxManage guestcontrol <vmname>|<uuid> copyto|cp 2796 < source on host> <destination on guest>2797 --username <name> [--password <password>]2807 <guest source> <host dest> --username <name> 2808 [--passwordfile <file> | --password <password>] 2798 2809 [--dryrun] [--follow] [--recursive] [--verbose]</screen> 2799 2810 … … 2838 2849 2839 2850 <glossentry> 2851 <glossterm>--passwordfile <file></glossterm> 2852 2853 <glossdef> 2854 <para>Password of the user account specified to be read from 2855 the given file. If not given, an empty password is 2856 assumed.</para> 2857 </glossdef> 2858 </glossentry> 2859 2860 <glossentry> 2840 2861 <glossterm>--password <password></glossterm> 2841 2862 … … 2894 2915 2895 2916 <listitem> 2917 <para><computeroutput>copyfrom</computeroutput>, which allows copying 2918 files from the guest to the host (only with installed Guest 2919 Additions 4.0 and later). It has the same parameters as 2920 <computeroutput>copyto</computeroutput> above.</para> 2921 </listitem> 2922 2923 <listitem> 2896 2924 <para><computeroutput>createdirectory</computeroutput>, which allows 2897 2925 copying files from the host to the guest (only with installed Guest … … 2899 2927 2900 2928 <screen>VBoxManage guestcontrol <vmname>|<uuid> createdir[ectory]|mkdir|md 2901 < directory to create on guest>2902 [-- username "<name>"] [--password "<password>"]2929 <guest directory>... --username <name> 2930 [--passwordfile <file> | --password <password>] 2903 2931 [--parents] [--mode <mode>] [--verbose]</screen> 2904 2932 … … 2936 2964 2937 2965 <glossentry> 2966 <glossterm>--passwordfile <file></glossterm> 2967 2968 <glossdef> 2969 <para>Password of the user account specified to be read from 2970 the given file. If not given, an empty password is 2971 assumed.</para> 2972 </glossdef> 2973 </glossentry> 2974 2975 <glossentry> 2938 2976 <glossterm>--password <password></glossterm> 2939 2977 … … 2985 3023 2986 3024 <screen>VBoxManage guestcontrol <vmname>|<uuid> stat 2987 <file element(s) to check on guest>2988 [-- username "<name>"] [--password "<password>"]3025 <file>... --username <name> 3026 [--passwordfile <file> | --password <password>] 2989 3027 [--verbose]</screen> 2990 3028 … … 3015 3053 <para>Name of the user the copy process should run under. 3016 3054 This user must exist on the guest OS.</para> 3055 </glossdef> 3056 </glossentry> 3057 3058 <glossentry> 3059 <glossterm>--passwordfile <file></glossterm> 3060 3061 <glossdef> 3062 <para>Password of the user account specified to be read from 3063 the given file. If not given, an empty password is 3064 assumed.</para> 3017 3065 </glossdef> 3018 3066 </glossentry> -
trunk/src/VBox/Frontends/VBoxManage/VBoxManageControlVM.cpp
r42444 r42445 1152 1152 uint32_t uPort = UINT32_MAX; 1153 1153 uint32_t cMsTimeout = 0; 1154 Bstr bstrPassword("");1154 Utf8Str strPassword; 1155 1155 static const RTGETOPTDEF s_aTeleportOptions[] = 1156 1156 { … … 1158 1158 { "--hostname", 'h', RTGETOPT_REQ_STRING }, /** @todo remove this */ 1159 1159 { "--maxdowntime", 'd', RTGETOPT_REQ_UINT32 }, 1160 { "--port", 'p', RTGETOPT_REQ_UINT32 }, /** @todo RTGETOPT_FLAG_MANDATORY */ 1161 { "--password", 'P', RTGETOPT_REQ_STRING }, 1160 { "--port", 'P', RTGETOPT_REQ_UINT32 }, /** @todo RTGETOPT_FLAG_MANDATORY */ 1161 { "--passwordfile", 'p', RTGETOPT_REQ_STRING }, 1162 { "--password", 'W', RTGETOPT_REQ_STRING }, 1162 1163 { "--timeout", 't', RTGETOPT_REQ_UINT32 }, 1163 1164 { "--detailed-progress", 'D', RTGETOPT_REQ_NOTHING } … … 1175 1176 case 'd': uMaxDowntime = Value.u32; break; 1176 1177 case 'D': g_fDetailedProgress = true; break; 1177 case 'p': uPort = Value.u32; break; 1178 case 'P': bstrPassword = Value.psz; break; 1178 case 'P': uPort = Value.u32; break; 1179 case 'p': 1180 { 1181 RTEXITCODE rcExit = readPasswordFile(Value.psz, &strPassword); 1182 if (rcExit != RTEXITCODE_SUCCESS) 1183 rc = E_FAIL; 1184 break; 1185 } 1186 case 'W': strPassword = Value.psz; break; 1179 1187 case 't': cMsTimeout = Value.u32; break; 1180 1188 default: … … 1189 1197 ComPtr<IProgress> progress; 1190 1198 CHECK_ERROR_BREAK(console, Teleport(bstrHostname.raw(), uPort, 1191 bstrPassword.raw(),1199 Bstr(strPassword).raw(), 1192 1200 uMaxDowntime, 1193 1201 progress.asOutParam())); -
trunk/src/VBox/Frontends/VBoxManage/VBoxManageGuestCtrl.cpp
r42444 r42445 224 224 " exec[ute]\n" 225 225 " --image <path to program> --username <name>\n" 226 " --passwordfile <file> | --password <password>\n"226 " [--passwordfile <file> | --password <password>]\n" 227 227 " [--environment \"<NAME>=<VALUE> [<NAME>=<VALUE>]\"]\n" 228 228 " [--verbose] [--timeout <msec>]\n" … … 235 235 " copyfrom\n" 236 236 " <guest source> <host dest> --username <name>\n" 237 " --passwordfile <file> | --password <password>\n"237 " [--passwordfile <file> | --password <password>]\n" 238 238 " [--dryrun] [--follow] [--recursive] [--verbose]\n" 239 239 "\n" 240 240 " copyto|cp\n" 241 241 " <host source> <guest dest> --username <name>\n" 242 " --passwordfile <file> | --password <password>\n"242 " [--passwordfile <file> | --password <password>]\n" 243 243 " [--dryrun] [--follow] [--recursive] [--verbose]\n" 244 244 "\n" 245 245 " createdir[ectory]|mkdir|md\n" 246 246 " <guest directory>... --username <name>\n" 247 " --passwordfile <file> | --password <password>\n"247 " [--passwordfile <file> | --password <password>]\n" 248 248 " [--parents] [--mode <mode>] [--verbose]\n" 249 249 "\n" 250 250 " stat\n" 251 251 " <file>... --username <name>\n" 252 " --passwordfile <file> | --password <password>\n"252 " [--passwordfile <file> | --password <password>]\n" 253 253 " [--verbose]\n" 254 254 "\n" -
trunk/src/VBox/Frontends/VBoxManage/VBoxManageHelp.cpp
r42444 r42445 347 347 " [--autostart-enabled on|off]\n" 348 348 " [--autostart-delay <seconds>]\n" 349 " [--autostop-type disabled|savestate|poweroff|acpishutdown]\n" 349 " [--autostop-type disabled|savestate|poweroff|\n" 350 " acpishutdown]\n" 350 351 "\n"); 351 352 } … … 444 445 " [--allowlocallogon <yes|no>] |\n" 445 446 " teleport --host <name> --port <port>\n" 446 " [--maxdowntime <msec>] [--password password]\n" 447 " [--maxdowntime <msec>]\n" 448 " [--passwordfile <file> |\n" 449 " --password <password>]\n" 447 450 " plugcpu <id>\n" 448 451 " unplugcpu <id>\n" … … 529 532 RTStrmPrintf(pStrm, 530 533 "VBoxManage bandwidthctl <uuid|vmname>\n" 531 " add <name> --type disk|network --limit <megabytes per second>[k|m|g|K|M|G] |\n" 532 " set <name> --limit <megabytes per second>[k|m|g|K|M|G] |\n" 534 " add <name> --type disk|network\n" 535 " --limit <megabytes per second>[k|m|g|K|M|G] |\n" 536 " set <name>\n" 537 " --limit <megabytes per second>[k|m|g|K|M|G] |\n" 533 538 " remove <name> |\n" 534 539 " list [--machinereadable]\n" 535 " (limit units: k=kilobit, m=megabit, g=gigabit, K=kilobyte, M=megabyte, G=gigabyte)\n" 540 " (limit units: k=kilobit, m=megabit, g=gigabit,\n" 541 " K=kilobyte, M=megabyte, G=gigabyte)\n" 536 542 "\n"); 537 543 … … 680 686 " getregisters [--cpu <id>] <reg>|all ... |\n" 681 687 " setregisters [--cpu <id>] <reg>=<value> ... |\n" 682 " show [--human-readable|--sh-export|--sh-eval|--cmd-set] \n" 683 " <logdbg-settings|logrel-settings> [[opt] what ...] |\n" 688 " show [--human-readable|--sh-export|--sh-eval|\n" 689 " --cmd-set] \n" 690 " <logdbg-settings|logrel-settings>\n" 691 " [[opt] what ...] |\n" 684 692 " statistics [--reset] [--pattern <pattern>]\n" 685 693 " [--descriptions]\n" -
trunk/src/VBox/Frontends/VBoxManage/VBoxManageModifyVM.cpp
r42381 r42445 2277 2277 case MODIFYVM_TELEPORTER_PASSWORD_FILE: 2278 2278 { 2279 size_t cbFile; 2280 char szPasswd[512]; 2281 int vrc = VINF_SUCCESS; 2282 bool fStdIn = !strcmp(ValueUnion.psz, "stdin"); 2283 PRTSTREAM pStrm; 2284 if (!fStdIn) 2285 vrc = RTStrmOpen(ValueUnion.psz, "r", &pStrm); 2286 else 2287 pStrm = g_pStdIn; 2288 if (RT_SUCCESS(vrc)) 2289 { 2290 vrc = RTStrmReadEx(pStrm, szPasswd, sizeof(szPasswd)-1, &cbFile); 2291 if (RT_SUCCESS(vrc)) 2292 { 2293 if (cbFile >= sizeof(szPasswd)-1) 2294 errorArgument("Provided password too long"); 2295 else 2296 { 2297 unsigned i; 2298 for (i = 0; i < cbFile && !RT_C_IS_CNTRL(szPasswd[i]); i++) 2299 ; 2300 szPasswd[i] = '\0'; 2301 CHECK_ERROR(machine, COMSETTER(TeleporterPassword)(Bstr(szPasswd).raw())); 2302 } 2303 } 2304 if (!fStdIn) 2305 RTStrmClose(pStrm); 2306 } 2307 else 2308 errorArgument("Cannot open password file '%s' (%Rrc)", ValueUnion.psz, vrc); 2279 Utf8Str password; 2280 RTEXITCODE rcExit = readPasswordFile(ValueUnion.psz, &password); 2281 if (rcExit != RTEXITCODE_SUCCESS) 2282 rc = E_FAIL; 2283 else 2284 CHECK_ERROR(machine, COMSETTER(TeleporterPassword)(Bstr(password).raw())); 2309 2285 break; 2310 2286 }
Note:
See TracChangeset
for help on using the changeset viewer.
