mirrors/rufus
1
0
Fork 0
mirror of https://github.com/pbatard/rufus.git synced 2025-05-22 02:45:11 -04:00
Code Issues Projects Releases Packages Wiki Activity

[core] make sure the system disk is never listed

Browse source 
* When using VHD or VMDK drives, it was possible for the system disk to be listed.
* Closes #541
This commit is contained in:
Pete Batard 2015-06-27 22:12:30 +01:00
parent f04167c51c
commit 477674016e
6 changed files with 49 additions and 26 deletions
Download patch file Download diff file Expand all files Collapse all files

12
src/format.c
View file

@ -1276,7 +1276,8 @@ BOOL SetupWinToGo(const char* drive_name, BOOL use_ms_efi)
static char san_policy_path[] = "?:\\san_policy.xml";
#endif
static char unattend_path[] = "?:\\Windows\\System32\\sysprep\\unattend.xml";
char *mounted_iso, *ms_efi = NULL, image[128], cmd[MAX_PATH], system_root[128];
char *mounted_iso, *ms_efi = NULL, image[128], cmd[MAX_PATH];
char usb_system_dir[] = "?:\\Windows\\System32";
unsigned char *buffer;
int i;
wchar_t wVolumeName[] = L"?:";
@ -1287,6 +1288,7 @@ BOOL SetupWinToGo(const char* drive_name, BOOL use_ms_efi)
PF_INIT(FormatEx, Fmifs);
uprintf("Windows To Go mode selected");
usb_system_dir[0] = drive_name[0];
// Additional sanity checks
if ( ((use_ms_efi) && (SelectedDrive.Geometry.MediaType != FixedMedia)) ||
((nWindowsVersion < WINDOWS_8) || ((WimExtractCheck() & 4) == 0)) ) {
@ -1353,16 +1355,12 @@ BOOL SetupWinToGo(const char* drive_name, BOOL use_ms_efi)
// Try the 'bcdboot' command, first using the one from the target drive and, if that doesn't work, the system's
uprintf("Enabling boot...");
for (i = 0; i < 2; i++) {
if (i == 0)
static_sprintf(system_root, "%s\\Windows\\System32", drive_name);
else
GetSystemDirectoryA(system_root, sizeof(system_root));
static_sprintf(cmd, "%s\\bcdboot.exe %s\\Windows /f ALL /s %s",
system_root, drive_name, (use_ms_efi)?ms_efi:drive_name);
(i==0)?usb_system_dir:system_dir, drive_name, (use_ms_efi)?ms_efi:drive_name);
if (RunCommand(cmd, NULL, TRUE) == 0)
break;
}
if (i >= 2) {
if (i >= 2) {
// Fatal, as the UFD is unlikely to boot then
uprintf("Failed to enable boot - aborting", cmd);
FormatStatus = ERROR_SEVERITY_ERROR|FAC(FACILITY_STORAGE)|APPERR(ERROR_ISO_EXTRACT);