foreman_bootdisk 22.0.2 → 23.0.0

data/locale/zh_CN/foreman_bootdisk.po

@@ -5,7 +5,7 @@
 # Translators:
 msgid ""
 msgstr ""
-"Project-Id-Version: foreman_bootdisk 22.0.0\n"
+"Project-Id-Version: foreman_bootdisk 22.0.2\n"
 "Report-Msgid-Bugs-To: \n"
 "PO-Revision-Date: 2014-02-13 12:12+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
@@ -72,28 +72,28 @@ msgid "Download subnet generic image"
 msgstr "下载子网通用镜像"
 
 msgid "Ensure %{file} is readable (or update \"Grub2 directory\" setting)"
-msgstr "确保 %%{file} 是可读的（或更新 \"Grub2 directory\" 设置）"
+msgstr "确保 %{file} 是可读的（或更新 \"Grub2 directory\" 设置）"
 
 msgid "Failed to attach ISO image to CDROM drive of instance %{name}: %{message}"
-msgstr "将 ISO 镜像附加到实例 %%{name} 的 CDROM 驱动失败：%%{message}"
+msgstr "将 ISO 镜像附加到实例 %{name} 的 CDROM 驱动失败：%{message}"
 
 msgid "Failed to create a directory within the ESP image"
 msgstr "无法在 ESP 镜像中创建目录"
 
 msgid "Failed to detach ISO image from CDROM drive of instance %{name}: %{message}"
-msgstr "未能成功将 ISO 镜像从实例 %%{name} 的 CDROM 驱动中断开：%%{message}"
+msgstr "未能成功将 ISO 镜像从实例 %{name} 的 CDROM 驱动中断开：%{message}"
 
 msgid "Failed to format the ESP image via mkfs.msdos"
 msgstr "无法通过 mkfs.msdos 格式化 ESP 镜像"
 
 msgid "Failed to generate ISO image for instance %{name}: %{message}"
-msgstr "为实例 %%{name} 生成 ISO 镜像：%%{message}"
+msgstr "为实例 %{name} 生成 ISO 镜像：%{message}"
 
 msgid "Failed to render boot disk template"
 msgstr "未能提供引导磁盘模板"
 
 msgid "Failed to upload ISO image for instance %{name}: %{message}"
-msgstr "为实例 %%{name} 上传 ISO 镜像失败：%%{message}"
+msgstr "为实例 %{name} 上传 ISO 镜像失败：%{message}"
 
 msgid "Full host '%s' image"
 msgstr "完整主机 '%s' 镜像"
@@ -237,13 +237,13 @@ msgid "Unable to find template specified by %s setting"
 msgstr "找不到由 %s 设置指定的模板"
 
 msgid "Unable to generate disk %{kind} template: %{error}"
-msgstr "无法生成磁盘 %%{kind} 模板 : %%{error}"
+msgstr "无法生成磁盘 %{kind} 模板 : %{error}"
 
 msgid "Unable to generate disk template, %{kind} template not found."
-msgstr "无法生成磁盘模板，未找到 %%{kind} 模板。"
+msgstr "无法生成磁盘模板，未找到 %{kind} 模板。"
 
 msgid "Unable to mcopy %{file}"
-msgstr "无法 mcopy %%{file}"
+msgstr "无法 mcopy %{file}"
 
 msgid "Upload ISO image to datastore for %s"
 msgstr "为 %s 将 ISO 镜像上传至数据存储"

data/locale/zh_TW/foreman_bootdisk.po

@@ -5,7 +5,7 @@
 # Translators:
 msgid ""
 msgstr ""
-"Project-Id-Version: foreman_bootdisk 22.0.0\n"
+"Project-Id-Version: foreman_bootdisk 22.0.2\n"
 "Report-Msgid-Bugs-To: \n"
 "PO-Revision-Date: 2014-02-13 12:12+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"

data/webpack/src/extensions/host/HostBootdiskButtons.js

@@ -1,7 +1,7 @@
 import React, { useEffect } from 'react';
 import { useSelector, useDispatch } from 'react-redux';
 
-import { DropdownItem, DropdownGroup } from '@patternfly/react-core';
+import { DropdownItem, DropdownGroup } from '@patternfly/react-core/deprecated';
 import {
   BanIcon,
   BuildIcon,

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: foreman_bootdisk
 version: !ruby/object:Gem::Version
-  version: 22.0.2
+  version: 23.0.0
 platform: ruby
 authors:
 - Dominic Cleal
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-10-11 00:00:00.000000000 Z
+date: 2025-04-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: theforeman-rubocop
@@ -91,77 +91,44 @@ files:
 - db/migrate/20221102105354_fix_bootdisk_settings_category_to_dsl.rb
 - lib/foreman_bootdisk.rb
 - lib/foreman_bootdisk/engine.rb
-- lib/foreman_bootdisk/engine.rb.orig
 - lib/foreman_bootdisk/version.rb
 - lib/tasks/bootdisk.rake
 - locale/Makefile
 - locale/ca/LC_MESSAGES/foreman_bootdisk.mo
-- locale/ca/foreman_bootdisk.edit.po
 - locale/ca/foreman_bootdisk.po
-- locale/ca/foreman_bootdisk.po.time_stamp
 - locale/cs_CZ/LC_MESSAGES/foreman_bootdisk.mo
-- locale/cs_CZ/foreman_bootdisk.edit.po
 - locale/cs_CZ/foreman_bootdisk.po
-- locale/cs_CZ/foreman_bootdisk.po.time_stamp
 - locale/de/LC_MESSAGES/foreman_bootdisk.mo
-- locale/de/foreman_bootdisk.edit.po
 - locale/de/foreman_bootdisk.po
-- locale/de/foreman_bootdisk.po.time_stamp
 - locale/en/LC_MESSAGES/foreman_bootdisk.mo
-- locale/en/foreman_bootdisk.edit.po
 - locale/en/foreman_bootdisk.po
-- locale/en/foreman_bootdisk.po.time_stamp
 - locale/en_GB/LC_MESSAGES/foreman_bootdisk.mo
-- locale/en_GB/foreman_bootdisk.edit.po
 - locale/en_GB/foreman_bootdisk.po
-- locale/en_GB/foreman_bootdisk.po.time_stamp
 - locale/es/LC_MESSAGES/foreman_bootdisk.mo
-- locale/es/foreman_bootdisk.edit.po
 - locale/es/foreman_bootdisk.po
-- locale/es/foreman_bootdisk.po.time_stamp
 - locale/foreman_bootdisk.pot
 - locale/fr/LC_MESSAGES/foreman_bootdisk.mo
-- locale/fr/foreman_bootdisk.edit.po
 - locale/fr/foreman_bootdisk.po
-- locale/fr/foreman_bootdisk.po.time_stamp
 - locale/gemspec.rb
 - locale/it/LC_MESSAGES/foreman_bootdisk.mo
-- locale/it/foreman_bootdisk.edit.po
 - locale/it/foreman_bootdisk.po
-- locale/it/foreman_bootdisk.po.time_stamp
 - locale/ja/LC_MESSAGES/foreman_bootdisk.mo
-- locale/ja/foreman_bootdisk.edit.po
 - locale/ja/foreman_bootdisk.po
-- locale/ja/foreman_bootdisk.po.time_stamp
 - locale/ka/LC_MESSAGES/foreman_bootdisk.mo
-- locale/ka/foreman_bootdisk.edit.po
 - locale/ka/foreman_bootdisk.po
-- locale/ka/foreman_bootdisk.po.time_stamp
 - locale/ko/LC_MESSAGES/foreman_bootdisk.mo
-- locale/ko/foreman_bootdisk.edit.po
 - locale/ko/foreman_bootdisk.po
-- locale/ko/foreman_bootdisk.po.time_stamp
 - locale/pt_BR/LC_MESSAGES/foreman_bootdisk.mo
-- locale/pt_BR/foreman_bootdisk.edit.po
 - locale/pt_BR/foreman_bootdisk.po
-- locale/pt_BR/foreman_bootdisk.po.time_stamp
 - locale/ru/LC_MESSAGES/foreman_bootdisk.mo
-- locale/ru/foreman_bootdisk.edit.po
 - locale/ru/foreman_bootdisk.po
-- locale/ru/foreman_bootdisk.po.time_stamp
 - locale/sv_SE/LC_MESSAGES/foreman_bootdisk.mo
-- locale/sv_SE/foreman_bootdisk.edit.po
 - locale/sv_SE/foreman_bootdisk.po
-- locale/sv_SE/foreman_bootdisk.po.time_stamp
 - locale/zanata.xml
 - locale/zh_CN/LC_MESSAGES/foreman_bootdisk.mo
-- locale/zh_CN/foreman_bootdisk.edit.po
 - locale/zh_CN/foreman_bootdisk.po
-- locale/zh_CN/foreman_bootdisk.po.time_stamp
 - locale/zh_TW/LC_MESSAGES/foreman_bootdisk.mo
-- locale/zh_TW/foreman_bootdisk.edit.po
 - locale/zh_TW/foreman_bootdisk.po
-- locale/zh_TW/foreman_bootdisk.po.time_stamp
 - package.json
 - webpack/__mocks__/foremanReact/common/HOC.js
 - webpack/__mocks__/foremanReact/common/I18n.js
@@ -200,7 +167,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.33
+rubygems_version: 3.5.22
 signing_key:
 specification_version: 4
 summary: Create boot disks to provision hosts with Foreman

data/lib/foreman_bootdisk/engine.rb.orig

@@ -1,159 +0,0 @@
-# frozen_string_literal: true
-
-require 'foreman_bootdisk'
-require 'fast_gettext'
-require 'gettext_i18n_rails'
-
-module ForemanBootdisk
-  class Engine < ::Rails::Engine
-    engine_name 'foreman_bootdisk'
-    isolate_namespace ForemanBootdisk
-
-    initializer 'foreman_bootdisk.mount_engine' do |app|
-      app.routes_reloader.paths << "#{ForemanBootdisk::Engine.root}/config/routes/mount_engine.rb"
-    end
-
-    initializer 'foreman_bootdisk.load_app_instance_data' do |app|
-      ForemanBootdisk::Engine.paths['db/migrate'].existent.each do |path|
-        app.config.paths['db/migrate'] << path
-      end
-    end
-
-    initializer 'foreman_bootdisk.apipie' do
-      Apipie.configuration.checksum_path += ['/bootdisk/api/']
-    end
-
-    initializer 'foreman_bootdisk.register_plugin', before: :finisher_hook do |app|
-      app.reloader.to_prepare do
-        Foreman::Plugin.register :foreman_bootdisk do
-          requires_foreman '>= 3.13'
-          # Add Global files for extending foreman-core components and routes
-          register_global_js_file 'global'
-          register_gettext
-
-          security_block :bootdisk do |_map|
-            permission :download_bootdisk, 'foreman_bootdisk/disks': %i[generic host full_host help bootdisk_options],
-                                          'foreman_bootdisk/subnet_disks': [:subnet],
-                                          'foreman_bootdisk/api/v2/disks': %i[generic host],
-                                          'foreman_bootdisk/api/v2/subnet_disks': [:subnet]
-          end
-
-          role 'Boot disk access', [:download_bootdisk], 'Role granting permissions to download bootdisks'
-          add_all_permissions_to_default_roles
-
-          apipie_documented_controllers ["#{ForemanBootdisk::Engine.root}/app/controllers/foreman_bootdisk/api/v2/*.rb"]
-          ApipieDSL.configuration.dsl_classes_matchers += [
-            "#{ForemanBootdisk::Engine.root}/app/lib/foreman_bootdisk/scope/*.rb"
-          ]
-          provision_method 'bootdisk', N_('Boot disk based')
-          allowed_template_helpers :bootdisk_chain_url, :bootdisk_raise
-
-<<<<<<< HEAD
-          extend_page "subnets/index" do |cx|
-            cx.add_pagelet :subnet_index_action_buttons, name: 'Bootdisk', partial: 'subnets/bootdisk_action_buttons'
-            cx.add_pagelet :subnet_index_title_buttons, name: 'Bootdisk', partial: 'subnets/bootdisk_title_buttons'
-          end
-=======
-        apipie_documented_controllers ["#{ForemanBootdisk::Engine.root}/app/controllers/foreman_bootdisk/api/v2/*.rb"]
-        ApipieDSL.configuration.dsl_classes_matchers += [
-          "#{ForemanBootdisk::Engine.root}/app/lib/foreman_bootdisk/scope/*.rb"
-        ]
-        provision_method 'bootdisk', N_('Boot disk based')
-        extend_template_helpers ForemanBootdisk::TemplateHelpers
->>>>>>> 968ca20 (Fixes #37792 - Safe mode and bootdisk_* template helpers)
-
-          settings do
-            category :bootdisk, N_("Boot disk") do
-              ipxe = ['/usr/lib/ipxe'].find { |p| File.exist?(p) } || '/usr/share/ipxe'
-              isolinux = ['/usr/lib/ISOLINUX'].find { |p| File.exist?(p) } || '/usr/share/syslinux'
-              syslinux = ['/usr/lib/syslinux/modules/bios', '/usr/lib/syslinux'].find { |p| File.exist?(p) } || '/usr/share/syslinux'
-              grub2 = ['/var/lib/tftpboot/grub2'].find { |p| File.exist?(p) } || '/var/lib/foreman/bootdisk'
-              templates = -> {
-                Hash[ProvisioningTemplate.where(template_kind: TemplateKind.where(name: 'Bootdisk')).map { |temp| [temp[:name], temp[:name]] }]
-              }
-
-              setting "bootdisk_ipxe_dir",
-                type: :string,
-                default: ipxe,
-                full_name: N_("iPXE directory"),
-                description: N_("Path to directory containing iPXE images")
-
-              setting "bootdisk_isolinux_dir",
-                type: :string,
-                default: isolinux,
-                full_name: N_("ISOLINUX directory"),
-                description: N_("Path to directory containing isolinux images")
-
-              setting "bootdisk_syslinux_dir",
-                type: :string,
-                default: syslinux,
-                full_name: N_("SYSLINUX directory"),
-                description: N_("Path to directory containing syslinux images")
-
-              setting "bootdisk_grub2_dir",
-                type: :string,
-                default: grub2,
-                full_name: N_("Grub2 directory"),
-                description: N_("Path to directory containing grubx64.efi and shimx64.efi")
-
-              setting "bootdisk_host_template",
-                type: :string,
-                collection: templates,
-                default: "Boot disk iPXE - host",
-                full_name: N_("Host image template"),
-                description: N_("iPXE template to use for host-specific boot disks")
-
-              setting "bootdisk_generic_host_template",
-                type: :string,
-                collection: templates,
-                default: "Boot disk iPXE - generic host",
-                full_name: N_("Generic image template"),
-                description: N_("iPXE template to use for generic host boot disks")
-
-              setting "bootdisk_generic_efi_host_template",
-                type: :string,
-                collection: templates,
-                default: "Boot disk Grub2 EFI - generic host",
-                full_name: N_("Generic Grub2 EFI image template"),
-                description: N_("iPXE template to use for generic EFI host boot disks")
-
-              setting "bootdisk_mkiso_command",
-                type: :string,
-                default: "genisoimage",
-                full_name: N_("ISO generation command"),
-                description: N_("Command to generate ISO image, use genisoimage or mkisofs")
-
-              setting "bootdisk_cache_media",
-                type: :boolean,
-                default: true,
-                full_name: N_("Installation media caching"),
-                description: N_("Installation media files will be cached for full host images")
-
-              setting "bootdisk_allowed_types",
-                type: :array,
-                default: Setting::Bootdisk.bootdisk_types,
-                full_name: N_("Allowed bootdisk types"),
-                description: N_("List of allowed bootdisk types, remove type to disable it")
-            end
-          end
-        end
-      end
-    end
-
-    config.to_prepare do
-      begin
-        ::HostsHelper.prepend ForemanBootdisk::HostsHelperExt
-        ::SubnetsHelper.include ForemanBootdisk::SubnetsHelperExt
-        Host::Managed.prepend ForemanBootdisk::HostExt
-        Host::Managed.include ForemanBootdisk::Orchestration::Compute
-        Foreman::Model::Vmware.prepend ForemanBootdisk::ComputeResources::Vmware if Foreman::Model::Vmware.available?
-      rescue StandardError => e
-        Rails.logger.warn "#{ForemanBootdisk::ENGINE_NAME}: skipping engine hook (#{e})"
-      end
-    end
-  end
-
-  def self.logger
-    Foreman::Logging.logger('foreman_bootdisk')
-  end
-end