tristan/ZealOS
1
0
Fork 0
mirror of https://github.com/Zeal-Operating-System/ZealOS.git synced 2025-03-14 12:05:07 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Make OSInstall use new DF_KEEP_FLAGS Diff Flag.

Browse source
This commit is contained in:
TomAwezome 2022-10-23 18:36:12 -04:00
parent d95f3b285b
commit e2c6bd060e
1 changed files with 7 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
src/Misc/OSInstall.ZC
View file

@ -73,7 +73,7 @@ U0 OSFilesMerge(U8 *dst_files_find_mask="/*", U8 *src_files_find_mask="/*", U8 *
I64 df_flags, fuf_flags = 0; I64 df_flags, fuf_flags = 0;
CDirEntry *tmpde1 = NULL, *tmpde2 = NULL; CDirEntry *tmpde1 = NULL, *tmpde2 = NULL;
df_flags = DF_REMAINDER_ALL_FILE2 | DF_NO_MORE_PROMPTS_THIS_FILE; df_flags = DF_REMAINDER_ALL_FILE2 | DF_NO_MORE_PROMPTS_THIS_FILE | DF_KEEP_FLAGS;
FlagsScan(&fuf_flags, Define("ST_FILE_UTIL_FLAGS"), "+r"); FlagsScan(&fuf_flags, Define("ST_FILE_UTIL_FLAGS"), "+r");
FlagsScan(&fuf_flags, Define("ST_FILE_UTIL_FLAGS"), fu_flags); FlagsScan(&fuf_flags, Define("ST_FILE_UTIL_FLAGS"), fu_flags);
if (fuf_flags & ~(FUG_FILES_FIND | FUF_DIFF)) if (fuf_flags & ~(FUG_FILES_FIND | FUF_DIFF))
@ -106,12 +106,8 @@ U0 OSMerge(U8 dst_drv, U8 src_drv=':')
U8 *src = MStrPrint("%C:/", src_drv); U8 *src = MStrPrint("%C:/", src_drv);
CopyTree(dst, "B:/"); CopyTree(dst, "B:/");
Del("B:/Misc/Bible.TXT"); Del("B:/Misc/Bible.TXT"); // Deleting from B:/ prevents causing hang when merging large .TXT files,
Del("B:/Misc/Clementine.TXT"); Del("B:/Misc/Clementine.TXT"); // they will instead be copied over from boot drive in OSMergeInner
// Copy(MStrPrint("%C:/Misc/Bible.TXT", src_drv), "B:/Misc/Bible.TXT");
// Copy(MStrPrint("%C:/Misc/Clementine.TXT", src_drv), "B:/Misc/Clementine.TXT");
// Copy(MStrPrint("%C:" ACD_WORD_FILENAME, src_drv), "B:" ACD_WORD_FILENAME);
// Copy(MStrPrint("%C:" ACD_DEF_FILENAME, src_drv), "B:" ACD_DEF_FILENAME);
OSFilesMerge("B:/", src, "+d"); OSFilesMerge("B:/", src, "+d");
CopyTree("B:/", dst); CopyTree("B:/", dst);
} }
@ -165,6 +161,10 @@ U0 OSUpgrade()
'\n'; '\n';
DocMax;
"\nBeginning Upgrade...\n\n";
OSMerge(drv_let); // src_drv needed? OSMerge(drv_let); // src_drv needed?
XTalkWait(task, "BootHDIns('%C');\n\nB\n0x20000\n%C\n%s\n\n", drv_let, drv_let, port_st); XTalkWait(task, "BootHDIns('%C');\n\nB\n0x20000\n%C\n%s\n\n", drv_let, drv_let, port_st);
@ -458,8 +458,6 @@ Bool DoInstall(Bool prompt_reboot)
CSMBIOSSystemInfo *sys_info = SMBIOSStructGet(SMBIOSt_SYSTEM); CSMBIOSSystemInfo *sys_info = SMBIOSStructGet(SMBIOSt_SYSTEM);
U8 *company = SMBIOSStr(sys_info, sys_info->manufacturer); U8 *company = SMBIOSStr(sys_info, sys_info->manufacturer);
DocMax;
if (StrCompare(company, "VMware, Inc.") && StrCompare(company, "innotek GmbH") && StrCompare(company, "QEMU")) if (StrCompare(company, "VMware, Inc.") && StrCompare(company, "innotek GmbH") && StrCompare(company, "QEMU"))
{ {
"\n\n\n\n\nAre you installing inside VMware, QEMU, VirtualBox or a similar virtual machine? "; "\n\n\n\n\nAre you installing inside VMware, QEMU, VirtualBox or a similar virtual machine? ";