From 82ad5d29aca01fa39c99f99a1ff7bc8a4a2afec9 Mon Sep 17 00:00:00 2001 From: TomAwezome Date: Mon, 24 Oct 2022 03:46:16 -0400 Subject: [PATCH] Improve printed report of success in BootMHDIns and LimineMHDIns. --- src/Misc/OSInstall.ZC | 13 +++++++++++++ src/System/Boot/BootMHDIns.ZC | 4 ++++ src/System/Boot/LimineMHDIns.ZC | 5 +++++ 3 files changed, 22 insertions(+) diff --git a/src/Misc/OSInstall.ZC b/src/Misc/OSInstall.ZC index d0174b75..abc9aacc 100755 --- a/src/Misc/OSInstall.ZC +++ b/src/Misc/OSInstall.ZC @@ -85,6 +85,7 @@ U0 OSFilesMerge(U8 *dst_files_find_mask="/*", U8 *src_files_find_mask="/*", U8 * while (ch != 'M' && ch != 'A'); if (ch == 'M') { + "%c\n", ch; PopUpOk("\n$$LTGREEN$$FILE2$$FG$$ is new changes.\n" "$$LTRED$$FILE1$$FG$$ is from existing install."); df_flags = 0; @@ -92,6 +93,7 @@ U0 OSFilesMerge(U8 *dst_files_find_mask="/*", U8 *src_files_find_mask="/*", U8 * } else { + "%c\n", ch; df_flags = DF_REMAINDER_ALL_FILE2 | DF_NO_MORE_PROMPTS_THIS_FILE | DF_KEEP_FLAGS; OSFilesMergeInner(tmpde1, tmpde2, &df_flags); } @@ -198,6 +200,8 @@ U0 OSUpgrade() ch = ToUpper(CharGet(, FALSE)); while (ch != 'Z' && ch != 'L'); + "%c\n", ch; + if (ch == 'Z') BootMHDIns(drv_let); else @@ -327,6 +331,8 @@ U0 VMInstallWiz() ch = ToUpper(CharGet(, FALSE)); while (ch != 'Z' && ch != 'L'); + "%c\n", ch; + if (ch == 'Z') BootMHDIns('C'); else @@ -436,6 +442,9 @@ U0 RegularInstallWiz() ch = ToUpper(CharGet(, FALSE)); while (ch != 'Z' && ch != 'L'); + + "%c\n", ch; + if (ch == 'Z') BootMHDIns(drv_let); else @@ -485,6 +494,8 @@ Bool DoInstall(Bool prompt_reboot) ch = ToUpper(CharGet(, FALSE)); while (ch != 'U' && ch != 'I'); + "%c\n", ch; + if (ch == 'U') OSUpgrade; else @@ -505,6 +516,8 @@ Bool DoInstall(Bool prompt_reboot) ch = ToUpper(CharGet(, FALSE)); while (ch != 'U' && ch != 'I'); + "%c\n", ch; + if (ch == 'I') { RegularInstallWiz(); diff --git a/src/System/Boot/BootMHDIns.ZC b/src/System/Boot/BootMHDIns.ZC index d23cd40b..6783d3e2 100755 --- a/src/System/Boot/BootMHDIns.ZC +++ b/src/System/Boot/BootMHDIns.ZC @@ -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"); j = 0; + "\nDetected boot drives:\n"; + "(Choice %16s)\n", "drv_offset"; if (FileFind(BOOT_DIR_OLDMBR_BIN, &de, FUF_JUST_FILES)) { Free(de.full_name); *_q++ = Clus2Blk(drive, de.clus); + "Old Boot Record\n"; CatPrint(menu_ptr, "0. Old Boot Record\n\r"); j++; } @@ -173,6 +176,7 @@ public Bool BootMHDIns(U8 drv_let, U8 *drv_list=NULL) res = TRUE; } } + "\nZealOS Public Domain HDD MBR Boot Loader installed.\n\n"; } catch PutExcept; diff --git a/src/System/Boot/LimineMHDIns.ZC b/src/System/Boot/LimineMHDIns.ZC index 1526f175..457a9a4b 100755 --- a/src/System/Boot/LimineMHDIns.ZC +++ b/src/System/Boot/LimineMHDIns.ZC @@ -54,6 +54,7 @@ Bool LimineCFGMake(U8 drv_let) DocWrite(doc); DocDel(doc); + "/Boot/Limine.CFG generated.\n\n"; 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)) @@ -86,6 +87,8 @@ Bool LimineMHDIns(U8 drv_let) return FALSE; } + '\n'; + limine_stage2->size_a = limine_stage2->size_b = limine_stage2_size_aligned / 2; limine_stage2->location_a = BLK_SIZE; limine_stage2->location_b = BLK_SIZE + limine_stage2->size_a; @@ -102,6 +105,8 @@ Bool LimineMHDIns(U8 drv_let) LimineCFGMake(drv_let); + "\nLimine BSD2-licensed HDD MBR Boot Loader installed.\n\n"; + return TRUE; }