From cc4e120366920326f2d2ebc29f14619ca8c0ae5e Mon Sep 17 00:00:00 2001 From: "Kirill Lipatov (Leency)" Date: Wed, 13 Sep 2023 23:43:36 +0000 Subject: [PATCH] Starting Blue screen: - The next message was improved: "New settings have been applied. Do you want to record them for the future boots? Answer 'yes' only if your booting device is writable." to avoid users saving changes on CD. This is a bug 'cos normally such behaviour must be handeled in the code http://board.kolibrios.org/viewtopic.php?p=80012#p80012 - Hide option "Create blank image" which is outdated now git-svn-id: svn://kolibrios.org@9938 a494cfbc-eb01-0410-851d-a64ba20cac60 --- kernel/trunk/boot/booten.inc | 8 +++++--- kernel/trunk/boot/bootru.inc | 7 ++++--- 2 files changed, 9 insertions(+), 6 deletions(-) diff --git a/kernel/trunk/boot/booten.inc b/kernel/trunk/boot/booten.inc index 376c01377f..14769cf588 100644 --- a/kernel/trunk/boot/booten.inc +++ b/kernel/trunk/boot/booten.inc @@ -34,9 +34,9 @@ bdev db "Load ramdisk from [1-floppy; 2-kolibri.img; 3-don't load]: ", else bdev db "Load ramdisk from [1-floppy; 2-C:\kolibri.img (FAT32);" db 13,10,186," " - db "3-use preloaded ram-image from kernel restart;" + db "3-preloaded ram-image (flash-disk, dualboot, " db 13,10,186," " - db "4-create blank image]: ",0 + db "kernel restart, etc.)]: ",0 end if prnotfnd db "Fatal - Videomode not found.",0 @@ -90,7 +90,9 @@ end if loading_msg db "Loading KolibriOS...",0 if ~ defined extended_primary_loader -save_quest db "Remember current settings? [y/n]: ",0 +save_quest db "New settings have been applied.",13,10,13,10,186 + db " Do you want to record them for the future boots?",13,10,186 + db " Answer 'yes' only if your booting device is writable. [y/n]: ",0 loader_block_error db "Bootloader data invalid, I cannot continue. Stopped.",0 end if diff --git a/kernel/trunk/boot/bootru.inc b/kernel/trunk/boot/bootru.inc index 1affe59ed1..6f55c8c289 100644 --- a/kernel/trunk/boot/bootru.inc +++ b/kernel/trunk/boot/bootru.inc @@ -34,8 +34,7 @@ bdev cp866 "Загрузить образ из [1-дискета; 2-ko cp866 "║ 3-не загружать]: ",0 else bdev cp866 "Загрузить образ из [1-дискета; 2-C:\kolibri.img (FAT32);",13,10 - cp866 "║ 3-использовать уже загруженный образ;",13,10 - cp866 "║ 4-создать чистый образ]: ",0 + cp866 "║ 3-использовать уже загруженный образ]:",0 end if prnotfnd cp866 "Ошибка - Видеорежим не найден.",0 @@ -89,7 +88,9 @@ end if loading_msg cp866 "Идёт загрузка KolibriOS...",0 if ~ defined extended_primary_loader ; saving not supported in this case -save_quest cp866 "Запомнить текущие настройки? [y/n]: ",0 +save_quest cp866 "Новые настройки были применены.",13,10,13,10 + cp866 "║ Хотите записать их для будущих загрузок? Отвечайте да, только",13,10 + cp866 "║ если ваше загрузочное устройство доступно для записи. [y/n]: ",0 loader_block_error cp866 "Ошибка в данных начального загрузчика, продолжение невозможно.",0 end if