calculate
/
calculate-toolkit
6
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Добавлена поддержка выполнения cl-kernel в chroot

Browse Source
master
Mike Khiretskiy 9 years ago
parent 01d8767022
commit b198c29ec0
5 changed files with 136 additions and 110 deletions
Show Stats Download Patch File Download Diff File

13
cl-kernel
Unescape View File

@ -401,6 +401,7 @@ do_args "$@"
# Подготовить переменные
# Prepare variables
########################
[[ "$(variable_value main.cl_chroot_status)" == "off" ]] && NOT_CHROOT=1
# вычислить архитектуру
# detect the architecture
@ -470,6 +471,11 @@ fi
# проверка доступности safemode
# check if safemode is available
if [[ -n $SAFEMODE ]] && [[ -z $NOT_CHROOT ]]
then
eerror $"--safemode unavailable for chroot"
fi
if [[ -n $SAFEMODE ]] && ! [[ $KVER =~ -calculate ]]
then
eerror $"--safemode available for calculate-sources only"
@ -655,7 +661,7 @@ then
VMLINUZ_VER=$(real_kernel_version $KERNEL_DIR)
if [[ -n $DRACUT ]] && grep -q "CONFIG_BLK_DEV_INITRD=y" ${NEW_CONFIG}
then
${DRACUT} -fH $LZ4 --kver=$VMLINUZ_VER /boot/initramfs-${VMLINUZ_VER}.img || eerror $"Failed to create the host-only initramfs"
${DRACUT} -f${NOT_CHROOT:+H} $LZ4 --kver=$VMLINUZ_VER /boot/initramfs-${VMLINUZ_VER}.img || eerror $"Failed to create the host-only initramfs"
if [[ $KVER =~ calculate ]] && [[ -n $SAFEMODE ]]
then
${DRACUT} -f $LZ4 --kver=$VMLINUZ_VER /boot/initramfs-${VMLINUZ_VER/-calculate/-SafeMode-calculate}.img || eerror $"Failed to create the safemode initramfs"
@ -668,7 +674,10 @@ then
# выполнение шаблонов для настройки загрузки системы
# applying the templates for boot configuration
cl-setup-boot
if [[ -n $NOT_CHROOT ]]
then
cl-setup-boot
fi
# вывод времени компиляции ядра
# display kernel compilation time

57
po/cl_kernel.pot
Unescape View File

@ -60,84 +60,87 @@ msgstr ""
#: ../cl-kernel:382
msgid "${fn} belongs to multiple packages"
msgstr ""
#: ../cl-kernel:460
#: ../cl-kernel:461
msgid "Kernel directory ${check_dir} not found"
msgstr ""
#: ../cl-kernel:461
#: ../cl-kernel:462
msgid "Kernel directory ${check_dir} has no full sources"
msgstr ""
#: ../cl-kernel:475
#: ../cl-kernel:476
msgid "--safemode unavailable for chroot"
msgstr ""
#: ../cl-kernel:481
msgid "--safemode available for calculate-sources only"
msgstr ""
#: ../cl-kernel:480
#: ../cl-kernel:486
msgid "--safemode unavailable without dracut"
msgstr ""
#: ../cl-kernel:489
#: ../cl-kernel:495
msgid "Failed to create the kernel template directory"
msgstr ""
#: ../cl-kernel:540
#: ../cl-kernel:546
msgid "Preparing the current kernel configuration"
msgstr ""
#: ../cl-kernel:548
#: ../cl-kernel:554
msgid "--convert is uncompatible with --march"
msgstr ""
#: ../cl-kernel:552
#: ../cl-kernel:558
msgid "--convert is uncompatible with --kver-old"
msgstr ""
#: ../cl-kernel:563
#: ../cl-kernel:569
msgid "Preparing the basic kernel configuration"
msgstr ""
#: ../cl-kernel:601
#: ../cl-kernel:607
msgid "The kernel configuration has not changed"
msgstr ""
#: ../cl-kernel:606
#: ../cl-kernel:612
msgid "Backing up the template"
msgstr ""
#: ../cl-kernel:610
#: ../cl-kernel:616
msgid "Failed to create a backup directory"
msgstr ""
#: ../cl-kernel:625
#: ../cl-kernel:631
msgid "Creating the template"
msgstr ""
#: ../cl-kernel:628
#: ../cl-kernel:634
msgid "Skipping the empty template"
msgstr ""
#: ../cl-kernel:643
#: ../cl-kernel:649
msgid "Failed to import make.conf"
msgstr ""
#: ../cl-kernel:647
#: ../cl-kernel:653
msgid "Failed to clean the kernel sources"
msgstr ""
#: ../cl-kernel:649
#: ../cl-kernel:655
msgid "Failed to compile the kernel"
msgstr ""
#: ../cl-kernel:650
#: ../cl-kernel:656
msgid "Failed to compile the kernel modules"
msgstr ""
#: ../cl-kernel:651
#: ../cl-kernel:657
msgid "Failed to install the kernel"
msgstr ""
#: ../cl-kernel:652
#: ../cl-kernel:658
msgid "Failed to build kernel"
msgstr ""
#: ../cl-kernel:658
#: ../cl-kernel:664
msgid "Failed to create the host-only initramfs"
msgstr ""
#: ../cl-kernel:661
#: ../cl-kernel:667
msgid "Failed to create the safemode initramfs"
msgstr ""
#: ../cl-kernel:682
#: ../cl-kernel:691
msgid "Kernel build time: "
msgstr ""
#: ../cl-kernel:685
#: ../cl-kernel:694
msgid "%d hour %d min %d sec\\n"
msgstr ""
#: ../cl-kernel:687
#: ../cl-kernel:696
msgid "%d min %d sec\\n"
msgstr ""
#: ../cl-kernel:700
#: ../cl-kernel:709
msgid "To rebuild kernel modules packages, please run:"
msgstr ""
#: ../cl-kernel:707
#: ../cl-kernel:716
msgid "All done!"
msgstr ""

59
po/cl_kernel_bg.po
Unescape View File

@ -116,110 +116,115 @@ msgstr "${fn} не принадлежи на нито един пакет"
msgid "${fn} belongs to multiple packages"
msgstr "${fn} принадлежи на няколко пакета"
#: ../cl-kernel:460
#: ../cl-kernel:461
msgid "Kernel directory ${check_dir} not found"
msgstr "Директорията на ядрото ${check_dir} не е открита"
#: ../cl-kernel:461
#: ../cl-kernel:462
msgid "Kernel directory ${check_dir} has no full sources"
msgstr "Директорията на ядрото ${check_dir} не съдържа целия изходен код"
#: ../cl-kernel:475
#: ../cl-kernel:476
#, fuzzy
msgid "--safemode unavailable for chroot"
msgstr "--safemode недостъпен без dracut"
#: ../cl-kernel:481
msgid "--safemode available for calculate-sources only"
msgstr "--safemode е достъпен само за calculate-sources"
#: ../cl-kernel:480
#: ../cl-kernel:486
msgid "--safemode unavailable without dracut"
msgstr "--safemode недостъпен без dracut"
#: ../cl-kernel:489
#: ../cl-kernel:495
msgid "Failed to create the kernel template directory"
msgstr "Грешка при създаване на директория за шаблоните на ядрото"
#: ../cl-kernel:540
#: ../cl-kernel:546
msgid "Preparing the current kernel configuration"
msgstr "Подготовка на текущата конфигурация на ядрото"
#: ../cl-kernel:548
#: ../cl-kernel:554
msgid "--convert is uncompatible with --march"
msgstr "--convert не е съвместим с --march"
#: ../cl-kernel:552
#: ../cl-kernel:558
msgid "--convert is uncompatible with --kver-old"
msgstr "--convert не е съвместим с --kver-old"
#: ../cl-kernel:563
#: ../cl-kernel:569
msgid "Preparing the basic kernel configuration"
msgstr "Подготовка базовата конфигурация на ядрото"
#: ../cl-kernel:601
#: ../cl-kernel:607
msgid "The kernel configuration has not changed"
msgstr "Конфигурацията на ядрото не е променена"
#: ../cl-kernel:606
#: ../cl-kernel:612
msgid "Backing up the template"
msgstr "Резервно копие на шаблона"
#: ../cl-kernel:610
#: ../cl-kernel:616
msgid "Failed to create a backup directory"
msgstr "Грешка при създаване на директория за резервни копия"
#: ../cl-kernel:625
#: ../cl-kernel:631
msgid "Creating the template"
msgstr "Създаване на шаблон"
#: ../cl-kernel:628
#: ../cl-kernel:634
msgid "Skipping the empty template"
msgstr "Пропускане на празен шаблон"
#: ../cl-kernel:643
#: ../cl-kernel:649
msgid "Failed to import make.conf"
msgstr "Грешка при внасяне на make.conf"
#: ../cl-kernel:647
#: ../cl-kernel:653
msgid "Failed to clean the kernel sources"
msgstr "Грешка при изпълнение на make clean за исходния код на ядрото"
#: ../cl-kernel:649
#: ../cl-kernel:655
msgid "Failed to compile the kernel"
msgstr "Грешка при изграждане на ядрото"
#: ../cl-kernel:650
#: ../cl-kernel:656
msgid "Failed to compile the kernel modules"
msgstr "Грешка при изграждане модулите на ядрото"
#: ../cl-kernel:651
#: ../cl-kernel:657
msgid "Failed to install the kernel"
msgstr "Грешка при инсталиране на ядрото"
#: ../cl-kernel:652
#: ../cl-kernel:658
msgid "Failed to build kernel"
msgstr "Грешка при изграждане на ядрото"
#: ../cl-kernel:658
#: ../cl-kernel:664
msgid "Failed to create the host-only initramfs"
msgstr "Грешка при създаване на host-only initramfs"
#: ../cl-kernel:661
#: ../cl-kernel:667
msgid "Failed to create the safemode initramfs"
msgstr "Грешка при създаване на safemode initramfs"
#: ../cl-kernel:682
#: ../cl-kernel:691
msgid "Kernel build time: "
msgstr "Време за изграждане на ядрото: "
#: ../cl-kernel:685
#: ../cl-kernel:694
msgid "%d hour %d min %d sec\\n"
msgstr "%d часа %d мин %d сек\\n"
#: ../cl-kernel:687
#: ../cl-kernel:696
msgid "%d min %d sec\\n"
msgstr "%d мин %d сек\\n"
#: ../cl-kernel:700
#: ../cl-kernel:709
msgid "To rebuild kernel modules packages, please run:"
msgstr ""
#: ../cl-kernel:707
#: ../cl-kernel:716
msgid "All done!"
msgstr "Готово!"

59
po/cl_kernel_fr.po
Unescape View File

@ -120,111 +120,116 @@ msgstr ""
msgid "${fn} belongs to multiple packages"
msgstr ""
#: ../cl-kernel:460
#: ../cl-kernel:461
msgid "Kernel directory ${check_dir} not found"
msgstr "Répertoire du noyau, ${check_dir}, introuvable"
#: ../cl-kernel:461
#: ../cl-kernel:462
msgid "Kernel directory ${check_dir} has no full sources"
msgstr ""
"Le répertoire du noyau, ${check_dir}, ne contient pas de sources complètes"
#: ../cl-kernel:475
#: ../cl-kernel:476
#, fuzzy
msgid "--safemode unavailable for chroot"
msgstr "L'option --safemode requiert dracut"
#: ../cl-kernel:481
msgid "--safemode available for calculate-sources only"
msgstr "L'option --safemode n'est disponible que pour calculate-sources"
#: ../cl-kernel:480
#: ../cl-kernel:486
msgid "--safemode unavailable without dracut"
msgstr "L'option --safemode requiert dracut"
#: ../cl-kernel:489
#: ../cl-kernel:495
msgid "Failed to create the kernel template directory"
msgstr "Impossible de créer le répertoire des modèles"
#: ../cl-kernel:540
#: ../cl-kernel:546
msgid "Preparing the current kernel configuration"
msgstr "Préparation de la configuration courante"
#: ../cl-kernel:548
#: ../cl-kernel:554
msgid "--convert is uncompatible with --march"
msgstr ""
#: ../cl-kernel:552
#: ../cl-kernel:558
msgid "--convert is uncompatible with --kver-old"
msgstr ""
#: ../cl-kernel:563
#: ../cl-kernel:569
msgid "Preparing the basic kernel configuration"
msgstr "Préparation de la configuration de base"
#: ../cl-kernel:601
#: ../cl-kernel:607
msgid "The kernel configuration has not changed"
msgstr "La configuration du noyau n'a pas été modifiée"
#: ../cl-kernel:606
#: ../cl-kernel:612
msgid "Backing up the template"
msgstr "Sauvegarde d'une copie du modèle"
#: ../cl-kernel:610
#: ../cl-kernel:616
msgid "Failed to create a backup directory"
msgstr "Impossible de créer le répertoire des copies"
#: ../cl-kernel:625
#: ../cl-kernel:631
msgid "Creating the template"
msgstr "Création du modèle"
#: ../cl-kernel:628
#: ../cl-kernel:634
msgid "Skipping the empty template"
msgstr "Omission du modèle vide"
#: ../cl-kernel:643
#: ../cl-kernel:649
msgid "Failed to import make.conf"
msgstr ""
#: ../cl-kernel:647
#: ../cl-kernel:653
msgid "Failed to clean the kernel sources"
msgstr ""
#: ../cl-kernel:649
#: ../cl-kernel:655
msgid "Failed to compile the kernel"
msgstr ""
#: ../cl-kernel:650
#: ../cl-kernel:656
msgid "Failed to compile the kernel modules"
msgstr ""
#: ../cl-kernel:651
#: ../cl-kernel:657
msgid "Failed to install the kernel"
msgstr ""
#: ../cl-kernel:652
#: ../cl-kernel:658
msgid "Failed to build kernel"
msgstr ""
#: ../cl-kernel:658
#: ../cl-kernel:664
msgid "Failed to create the host-only initramfs"
msgstr ""
#: ../cl-kernel:661
#: ../cl-kernel:667
msgid "Failed to create the safemode initramfs"
msgstr ""
#: ../cl-kernel:682
#: ../cl-kernel:691
msgid "Kernel build time: "
msgstr "Temps de compilation du noyau : "
#: ../cl-kernel:685
#: ../cl-kernel:694
msgid "%d hour %d min %d sec\\n"
msgstr ""
#: ../cl-kernel:687
#: ../cl-kernel:696
msgid "%d min %d sec\\n"
msgstr ""
#: ../cl-kernel:700
#: ../cl-kernel:709
msgid "To rebuild kernel modules packages, please run:"
msgstr "Pour recompiler les paquets des modules noyau, tapez :"
#: ../cl-kernel:707
#: ../cl-kernel:716
msgid "All done!"
msgstr "C'est fait !"

58
po/cl_kernel_ru.po
Unescape View File

@ -117,110 +117,114 @@ msgstr "${fn} не принадлежит ни одному пакету"
msgid "${fn} belongs to multiple packages"
msgstr "${fn} принадлежит нескольким пакетам"
#: ../cl-kernel:460
#: ../cl-kernel:461
msgid "Kernel directory ${check_dir} not found"
msgstr "Директория ядра ${check_dir} не найдена"
#: ../cl-kernel:461
#: ../cl-kernel:462
msgid "Kernel directory ${check_dir} has no full sources"
msgstr "Директория ядра ${check_dir} не содержит всего исходного кода"
#: ../cl-kernel:475
#: ../cl-kernel:476
msgid "--safemode unavailable for chroot"
msgstr "--safemode недоступен для chroot"
#: ../cl-kernel:481
msgid "--safemode available for calculate-sources only"
msgstr "--safemode доступен только для calculate-sources"
#: ../cl-kernel:480
#: ../cl-kernel:486
msgid "--safemode unavailable without dracut"
msgstr "--safemode недоступен без dracut"
#: ../cl-kernel:489
#: ../cl-kernel:495
msgid "Failed to create the kernel template directory"
msgstr "Не удалось создать директорию для шаблонов ядра"
#: ../cl-kernel:540
#: ../cl-kernel:546
msgid "Preparing the current kernel configuration"
msgstr "Подготовка текущей конфигурации ядра"
#: ../cl-kernel:548
#: ../cl-kernel:554
msgid "--convert is uncompatible with --march"
msgstr "--convert не совместим с --march"
#: ../cl-kernel:552
#: ../cl-kernel:558
msgid "--convert is uncompatible with --kver-old"
msgstr "--convert не совместим с --kver-old"
#: ../cl-kernel:563
#: ../cl-kernel:569
msgid "Preparing the basic kernel configuration"
msgstr "Подготовка базовой конфигурации ядра"
#: ../cl-kernel:601
#: ../cl-kernel:607
msgid "The kernel configuration has not changed"
msgstr "Конфигурация ядра не изменилась"
#: ../cl-kernel:606
#: ../cl-kernel:612
msgid "Backing up the template"
msgstr "Резервное копирование шаблона"
#: ../cl-kernel:610
#: ../cl-kernel:616
msgid "Failed to create a backup directory"
msgstr "Не удалось создать директорию для резервных копий"
#: ../cl-kernel:625
#: ../cl-kernel:631
msgid "Creating the template"
msgstr "Создание шаблона"
#: ../cl-kernel:628
#: ../cl-kernel:634
msgid "Skipping the empty template"
msgstr "Пропуск пустого шаблона"
#: ../cl-kernel:643
#: ../cl-kernel:649
msgid "Failed to import make.conf"
msgstr "Не удалось импортировать make.conf"
#: ../cl-kernel:647
#: ../cl-kernel:653
msgid "Failed to clean the kernel sources"
msgstr "Не удалось выполнить make clean для исходного кода ядра"
#: ../cl-kernel:649
#: ../cl-kernel:655
msgid "Failed to compile the kernel"
msgstr "Не удалось скомпилировать ядро"
#: ../cl-kernel:650
#: ../cl-kernel:656
msgid "Failed to compile the kernel modules"
msgstr "Не удалось собрать модули ядра"
#: ../cl-kernel:651
#: ../cl-kernel:657
msgid "Failed to install the kernel"
msgstr "Не удалось установить ядро"
#: ../cl-kernel:652
#: ../cl-kernel:658
msgid "Failed to build kernel"
msgstr "Не удалось собрать ядро"
#: ../cl-kernel:658
#: ../cl-kernel:664
msgid "Failed to create the host-only initramfs"
msgstr "Не удалось создать host-only initramfs"
#: ../cl-kernel:661
#: ../cl-kernel:667
msgid "Failed to create the safemode initramfs"
msgstr "Не удалось создать safemode initramfs"
#: ../cl-kernel:682
#: ../cl-kernel:691
msgid "Kernel build time: "
msgstr "Время сборки ядра: "
#: ../cl-kernel:685
#: ../cl-kernel:694
msgid "%d hour %d min %d sec\\n"
msgstr "%d час %d мин %d сек\\n"
#: ../cl-kernel:687
#: ../cl-kernel:696
msgid "%d min %d sec\\n"
msgstr "%d мин %d сек\\n"
#: ../cl-kernel:700
#: ../cl-kernel:709
msgid "To rebuild kernel modules packages, please run:"
msgstr "Для пересборки пакетов модулей ядра необходимо запустить:"
#: ../cl-kernel:707
#: ../cl-kernel:716
msgid "All done!"
msgstr "Все готово!"

Write Preview
Loading…
Cancel
Save