tristan/ZealOS
1
0
Fork 0
mirror of https://github.com/Zeal-Operating-System/ZealOS.git synced 2024-12-26 15:26:43 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Improve printed report of success in BootMHDIns and LimineMHDIns.

Browse source
This commit is contained in:
TomAwezome 2022-10-24 03:46:16 -04:00
parent ce6c9c29ad
commit 82ad5d29ac
3 changed files with 22 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
src/Misc/OSInstall.ZC
View file

@ -85,6 +85,7 @@ U0 OSFilesMerge(U8 *dst_files_find_mask="/*", U8 *src_files_find_mask="/*", U8 *
while (ch != 'M' && ch != 'A'); while (ch != 'M' && ch != 'A');
if (ch == 'M') if (ch == 'M')
{ {
"%c\n", ch;
PopUpOk("\n$$LTGREEN$$FILE2$$FG$$ is new changes.\n" PopUpOk("\n$$LTGREEN$$FILE2$$FG$$ is new changes.\n"
"$$LTRED$$FILE1$$FG$$ is from existing install."); "$$LTRED$$FILE1$$FG$$ is from existing install.");
df_flags = 0; df_flags = 0;
@ -92,6 +93,7 @@ U0 OSFilesMerge(U8 *dst_files_find_mask="/*", U8 *src_files_find_mask="/*", U8 *
} }
else else
{ {
"%c\n", ch;
df_flags = DF_REMAINDER_ALL_FILE2 | DF_NO_MORE_PROMPTS_THIS_FILE | DF_KEEP_FLAGS; df_flags = DF_REMAINDER_ALL_FILE2 | DF_NO_MORE_PROMPTS_THIS_FILE | DF_KEEP_FLAGS;
OSFilesMergeInner(tmpde1, tmpde2, &df_flags); OSFilesMergeInner(tmpde1, tmpde2, &df_flags);
} }
@ -198,6 +200,8 @@ U0 OSUpgrade()
ch = ToUpper(CharGet(, FALSE)); ch = ToUpper(CharGet(, FALSE));
while (ch != 'Z' && ch != 'L'); while (ch != 'Z' && ch != 'L');
"%c\n", ch;
if (ch == 'Z') if (ch == 'Z')
BootMHDIns(drv_let); BootMHDIns(drv_let);
else else
@ -327,6 +331,8 @@ U0 VMInstallWiz()
ch = ToUpper(CharGet(, FALSE)); ch = ToUpper(CharGet(, FALSE));
while (ch != 'Z' && ch != 'L'); while (ch != 'Z' && ch != 'L');
"%c\n", ch;
if (ch == 'Z') if (ch == 'Z')
BootMHDIns('C'); BootMHDIns('C');
else else
@ -436,6 +442,9 @@ U0 RegularInstallWiz()
ch = ToUpper(CharGet(, FALSE)); ch = ToUpper(CharGet(, FALSE));
while (ch != 'Z' && ch != 'L'); while (ch != 'Z' && ch != 'L');
"%c\n", ch;
if (ch == 'Z') if (ch == 'Z')
BootMHDIns(drv_let); BootMHDIns(drv_let);
else else
@ -485,6 +494,8 @@ Bool DoInstall(Bool prompt_reboot)
ch = ToUpper(CharGet(, FALSE)); ch = ToUpper(CharGet(, FALSE));
while (ch != 'U' && ch != 'I'); while (ch != 'U' && ch != 'I');
"%c\n", ch;
if (ch == 'U') if (ch == 'U')
OSUpgrade; OSUpgrade;
else else
@ -505,6 +516,8 @@ Bool DoInstall(Bool prompt_reboot)
ch = ToUpper(CharGet(, FALSE)); ch = ToUpper(CharGet(, FALSE));
while (ch != 'U' && ch != 'I'); while (ch != 'U' && ch != 'I');
"%c\n", ch;
if (ch == 'I') if (ch == 'I')
{ {
RegularInstallWiz(); RegularInstallWiz();

4
src/System/Boot/BootMHDIns.ZC
View file

@ -117,10 +117,13 @@ public Bool BootMHDIns(U8 drv_let, U8 *drv_list=NULL)
StrPrint(menu_ptr, "\n\r\n\rZealOS Boot Loader\n\r\n\r"); StrPrint(menu_ptr, "\n\r\n\rZealOS Boot Loader\n\r\n\r");
j = 0; j = 0;
"\nDetected boot drives:\n";
"(Choice %16s)\n", "drv_offset";
if (FileFind(BOOT_DIR_OLDMBR_BIN, &de, FUF_JUST_FILES)) if (FileFind(BOOT_DIR_OLDMBR_BIN, &de, FUF_JUST_FILES))
{ {
Free(de.full_name); Free(de.full_name);
*_q++ = Clus2Blk(drive, de.clus); *_q++ = Clus2Blk(drive, de.clus);
"Old Boot Record\n";
CatPrint(menu_ptr, "0. Old Boot Record\n\r"); CatPrint(menu_ptr, "0. Old Boot Record\n\r");
j++; j++;
} }
@ -173,6 +176,7 @@ public Bool BootMHDIns(U8 drv_let, U8 *drv_list=NULL)
res = TRUE; res = TRUE;
} }
} }
"\nZealOS Public Domain HDD MBR Boot Loader installed.\n\n";
} }
catch catch
PutExcept; PutExcept;

5
src/System/Boot/LimineMHDIns.ZC
View file

@ -54,6 +54,7 @@ Bool LimineCFGMake(U8 drv_let)
DocWrite(doc); DocWrite(doc);
DocDel(doc); DocDel(doc);
"/Boot/Limine.CFG generated.\n\n";
for (i = 0, drive = blkdev.drvs; i < DRIVES_NUM; i++, drive++) for (i = 0, drive = blkdev.drvs; i < DRIVES_NUM; i++, drive++)
{ {
if (drive->drive_signature == DRIVE_SIGNATURE_VAL && drive->fs_type == FSt_FAT32 && DriveIsWritable(drive->drv_let)) if (drive->drive_signature == DRIVE_SIGNATURE_VAL && drive->fs_type == FSt_FAT32 && DriveIsWritable(drive->drv_let))
@ -86,6 +87,8 @@ Bool LimineMHDIns(U8 drv_let)
return FALSE; return FALSE;
} }
'\n';
limine_stage2->size_a = limine_stage2->size_b = limine_stage2_size_aligned / 2; limine_stage2->size_a = limine_stage2->size_b = limine_stage2_size_aligned / 2;
limine_stage2->location_a = BLK_SIZE; limine_stage2->location_a = BLK_SIZE;
limine_stage2->location_b = BLK_SIZE + limine_stage2->size_a; limine_stage2->location_b = BLK_SIZE + limine_stage2->size_a;
@ -102,6 +105,8 @@ Bool LimineMHDIns(U8 drv_let)
LimineCFGMake(drv_let); LimineCFGMake(drv_let);
"\nLimine BSD2-licensed HDD MBR Boot Loader installed.\n\n";
return TRUE; return TRUE;
} }