foreman_bootdisk 3.1.2 → 3.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6e2545c008aab7752ca6a9a396bb6f07c247872c
-  data.tar.gz: 7f99466c2e65a501e9d4e851c185f3f246e18e15
+  metadata.gz: 46d02f0f719544d09421d89d5f699baf68206f14
+  data.tar.gz: ac144ffdbc3e21e24ef67170fb893f25c1bc020c
 SHA512:
-  metadata.gz: 769076ee4275b5199c9d42a56deb210f07f2e3979e145bd2ad467334e0f2da1289e02cbe607fc14677dd844c2d1200291cacf1718278f7df7cbc179ad157cb0f
-  data.tar.gz: 2f0b7e4043d7207b335ca985dbd72c4b4400dcdf7a1c61be52bfac8f837564a0dd6d9064cccb44fbbc6f7377eebe481bc3b70ec2fbee53a40b1963fb656843ca
+  metadata.gz: 6daa98d28068a4f6a03f0ce0464dff081882467e030be727101ce5b2a8635c985767824975cae9150d1dd1d68557738ec186e5bb08a39368fad75122af580ac9
+  data.tar.gz: 4b03b7f8a9616ff2952aa6b9bcdb03bfb772dd0b94d7ae8d3f8d5ec0fe795129be2dd96ae777faae3313d69eab7fd2b42204047b20ab118df9c15b579fcc3bd3

data/CHANGES.md

@@ -1,5 +1,10 @@
 # Changelog
 
+## v3.2.0
+* add full host image containing OS bootloader for hosts that fail to
+  chainload with isolinux and iPXE (#7046)
+* partial it, zh_CN, zh_TW, ru, ja, ko translations added
+
 ## v3.1.2
 * add help page
 * rearrange README to be clearer about basic vs advanced config

data/README.md

@@ -94,6 +94,7 @@ TFTP settings are needed.
     <th>DHCP required</th>
     <th>DHCP reservation</th>
     <th>Pre-register host</th>
+    <th>OS-specific</th>
   </tr>
   <tr>
     <td>Per-host image</td>
@@ -101,6 +102,15 @@ TFTP settings are needed.
     <td>No</td>
     <td>No</td>
     <td>Yes</td>
+    <td>No</td>
+  </tr>
+  <tr>
+    <td>Full host image</td>
+    <td>No</td>
+    <td>No</td>
+    <td>No</td>
+    <td>Yes</td>
+    <td>Yes</td>
   </tr>
   <tr>
     <td>Generic image</td>
@@ -108,6 +118,7 @@ TFTP settings are needed.
     <td>Yes</td>
     <td>No</td>
     <td>Yes</td>
+    <td>No</td>
   </tr>
 </table>
 
@@ -134,6 +145,32 @@ plugin and run:
 
 See the hammer_cli_foreman_bootdisk documentation for more advanced usage.
 
+### Per-host full images
+
+A variant of the per-host image, this version doesn't chainload from Foreman,
+but contains the initial OS bootloader.  It can be useful for hosts that fail
+to chainload correctly, but has the downsides that it may become out of date
+if the host OS, bootloader or templates change, or build tokens are required
+and expire.
+
+To generate the image from the web interface, view the host page, click the
+"Boot disk" button and select "Full host 'FQDN' image".  This image may take
+a while to generate, as it downloads the OS bootloaders which can be
+considerable in size.
+
+To generate from the command line on the Foreman server:
+
+    foreman-rake bootdisk:generate:full_host NAME=foo.example.com
+
+Optionally set `OUTPUT=/path/foo.iso` to change the output destination.
+
+To generate using the Hammer CLI, install the [hammer_cli_foreman_bootdisk](https://github.com/theforeman/hammer_cli_foreman_bootdisk)
+plugin and run:
+
+    hammer bootdisk host --host client.example.com --full true
+
+See the hammer_cli_foreman_bootdisk documentation for more advanced usage.
+
 ### Generic image
 
 This provides a single ISO that can be used by all registered hosts, but since
@@ -187,6 +224,9 @@ new template and set the name in Administer>Settings>Bootdisk.
 These templates are baked into the downloaded ISO files and generally don't
 need to be modified.
 
+Full host images boot directly into the OS PXELinux template via ISOLinux,
+with no intermediate template or bootloader.
+
 ### Settings
 
 Some more advanced settings are available under Administer>Settings>Bootdisk in
@@ -195,6 +235,8 @@ the Foreman UI.
 * `bootdisk_ipxe_dir` points to the directory containing ipxe.lkrn
 * `bootdisk_syslinux_dir` points to the directory containing syslinux images
 * `bootdisk_mkiso_command` is the name of genisoimage/mkisofs on your OS
+* `bootdisk_cache_media` controls whether to cache OS boot files from
+  installation media for full host images
 
 # Issues
 

data/app/controllers/foreman_bootdisk/api/v2/disks_controller.rb

@@ -20,18 +20,25 @@ module ForemanBootdisk
         api :GET, '/generic', N_('Download generic image')
         def generic
           tmpl = ForemanBootdisk::Renderer.new.generic_template_render
-          ForemanBootdisk::ISOGenerator.new(tmpl).generate do |iso|
+          ForemanBootdisk::ISOGenerator.generate(:ipxe => tmpl) do |iso|
             send_data File.read(iso), :filename => "bootdisk_#{URI.parse(Setting[:foreman_url]).host}.iso"
           end
         end
 
         api :GET, '/hosts/:host_id', N_('Download host image')
+        param :full, :bool, :required => false, :desc => N_('True for full, false for basic reusable image')
         param :host_id, :identifier_dottable, :required => true
         def host
           host = @disk
-          tmpl = host.bootdisk_template_render
-          ForemanBootdisk::ISOGenerator.new(tmpl).generate do |iso|
-            send_data File.read(iso), :filename => "#{host.name}.iso"
+          if params[:full]
+            ForemanBootdisk::ISOGenerator.generate_full_host(host) do |iso|
+              send_data File.read(iso), :filename => "#{host.name}#{ForemanBootdisk::ISOGenerator.token_expiry(host)}.iso"
+            end
+          else
+            tmpl = host.bootdisk_template_render
+            ForemanBootdisk::ISOGenerator.generate(:ipxe => tmpl) do |iso|
+              send_data File.read(iso), :filename => "#{host.name}.iso"
+            end
           end
         end
 

data/app/controllers/foreman_bootdisk/disks_controller.rb

@@ -2,7 +2,7 @@ require 'uri'
 
 module ForemanBootdisk
   class DisksController < ::ApplicationController
-    before_filter :find_by_name, :only => %w[host]
+    before_filter :find_by_name, :only => %w[host full_host]
 
     def generic
       begin
@@ -13,7 +13,7 @@ module ForemanBootdisk
         return
       end
 
-      ForemanBootdisk::ISOGenerator.new(tmpl).generate do |iso|
+      ForemanBootdisk::ISOGenerator.generate(:ipxe => tmpl) do |iso|
         send_data File.read(iso), :filename => "bootdisk_#{URI.parse(Setting[:foreman_url]).host}.iso"
       end
     end
@@ -28,11 +28,18 @@ module ForemanBootdisk
         return
       end
 
-      ForemanBootdisk::ISOGenerator.new(tmpl).generate do |iso|
+      ForemanBootdisk::ISOGenerator.generate(:ipxe => tmpl) do |iso|
         send_data File.read(iso), :filename => "#{host.name}.iso"
       end
     end
 
+    def full_host
+      host = @disk
+      ForemanBootdisk::ISOGenerator.generate_full_host(host) do |iso|
+        send_data File.read(iso), :filename => "#{host.name}#{ForemanBootdisk::ISOGenerator.token_expiry(host)}.iso"
+      end
+    end
+
     def help
     end
 

data/app/helpers/concerns/foreman_bootdisk/hosts_helper_ext.rb

@@ -10,6 +10,7 @@ module ForemanBootdisk::HostsHelperExt
       button_group(
         select_action_button(_('Boot disk'), {},
           display_bootdisk_link_if_authorized(_("Host '%s' image") % @host.name.split('.')[0], {:controller => 'foreman_bootdisk/disks', :action => 'host', :id => @host}, :class=>'btn'),
+          display_bootdisk_link_if_authorized(_("Full host '%s' image") % @host.name.split('.')[0], {:controller => 'foreman_bootdisk/disks', :action => 'full_host', :id => @host}, :class=>'btn'),
           display_bootdisk_link_if_authorized(_("Generic image"), {:controller => 'foreman_bootdisk/disks', :action => 'generic'}, :class=>'btn'),
           display_bootdisk_link_if_authorized(_("Help"), {:controller => 'foreman_bootdisk/disks', :action => 'help'}, :class=>'btn')
         )

data/app/models/concerns/foreman_bootdisk/host_ext.rb

@@ -8,10 +8,6 @@ module ForemanBootdisk::HostExt
   end
 
   def bootdisk_template_render
-    if (Gem::Version.new(SETTINGS[:version].notag) < Gem::Version.new('1.5')) && Setting[:safemode_render]
-      raise(::Foreman::Exception.new(N_('Bootdisk is not supported with safemode rendering, please disable safemode_render under Adminster>Settings')))
-    end
-
     @host = self
     pxe_render(bootdisk_template.template)
   end

data/app/models/setting/bootdisk.rb

@@ -13,6 +13,7 @@ class Setting::Bootdisk< ::Setting
         self.set('bootdisk_host_template', N_('iPXE template to use for host-specific boot disks'), 'Boot disk iPXE - host'),
         self.set('bootdisk_generic_host_template', N_('iPXE template to use for generic host boot disks'), 'Boot disk iPXE - generic host'),
         self.set('bootdisk_mkiso_command', N_('Command to generate ISO image, use genisoimage or mkisofs'), 'genisoimage'),
+        self.set('bootdisk_cache_media', N_('Installation media files will be cached for full host images'), true),
       ].compact.each { |s| self.create s.update(:category => "Setting::Bootdisk") }
     end
 

data/app/services/foreman_bootdisk/iso_generator.rb

@@ -1,36 +1,73 @@
+require 'net/http'
+require 'uri'
+
 # Generates an iPXE ISO hybrid image
 #
 # requires syslinux, ipxe/ipxe-bootimgs, genisoimage, isohybrid
 class ForemanBootdisk::ISOGenerator
-  attr_reader :script
+  def self.generate_full_host(host, &block)
+    raise ::Foreman::Exception.new(N_('Host is not in build mode, so the template cannot be rendered')) unless host.build?
+
+    tmpl = host.send(:generate_pxe_template)
+    raise ::Foreman::Exception.new(N_('Unable to generate disk template: %s'), host.errors.full_messages.to_sentence) if tmpl == false
+
+    # pxe_files and filename conversion is utterly bizarre
+    # aim to convert filenames to something usable under ISO 9660, update the template to match
+    # and then still ensure that the fetch() process stores them under the same name
+    files = host.operatingsystem.pxe_files(host.medium, host.architecture, host)
+    files.map! do |bootfile_info|
+      bootfile_info.map do |f|
+        suffix = f[1].split('/').last
+        iso_suffix = iso9660_filename(suffix)
+        iso_f0 = iso9660_filename(f[0].to_s) + '_' + iso_suffix
+        tmpl.gsub!(f[0].to_s + '-' + suffix, iso_f0)
+        Rails.logger.debug("Boot file #{iso_f0}, source #{f[1]}")
+        [iso_f0, f[1]]
+      end
+    end
 
-  def initialize(script, opts = {})
-    @script = script
+    generate({ :isolinux => tmpl, :files => files }, &block)
   end
 
-  def generate(&block)
+  def self.generate(opts = {}, &block)
+    opts[:isolinux] = <<-EOS if opts[:isolinux].nil? && opts[:ipxe]
+      default ipxe
+      label ipxe
+      kernel /ipxe
+      initrd /script
+    EOS
+
     Dir.mktmpdir('bootdisk') do |wd|
       Dir.mkdir(File.join(wd, 'build'))
-      File.open(File.join(wd, 'build', 'isolinux.cfg'),'w') do |file|
-        file.write(<<EOF)
-default ipxe
-label ipxe
-kernel /ipxe
-initrd /script
-EOF
+
+      if opts[:isolinux]
+        unless File.exists?(File.join(Setting[:bootdisk_syslinux_dir], 'isolinux.bin'))
+          raise ::Foreman::Exception.new(N_("Please ensure the ipxe-bootimgs and syslinux packages are installed."))
+        end
+        FileUtils.cp(File.join(Setting[:bootdisk_syslinux_dir], 'isolinux.bin'), File.join(wd, 'build', 'isolinux.bin'))
+        File.open(File.join(wd, 'build', 'isolinux.cfg'), 'w') do |file|
+          file.write(opts[:isolinux])
+        end
       end
 
-      unless (File.exists?(File.join(Setting[:bootdisk_ipxe_dir], 'ipxe.lkrn')) &&
-              (File.exists?(File.join(Setting[:bootdisk_syslinux_dir], 'isolinux.bin'))))
-        raise ::Foreman::Exception.new(N_("Please ensure the ipxe-bootimgs and syslinux packages are installed."))
+      if opts[:ipxe]
+        unless File.exists?(File.join(Setting[:bootdisk_ipxe_dir], 'ipxe.lkrn'))
+          raise ::Foreman::Exception.new(N_("Please ensure the ipxe-bootimgs and syslinux packages are installed."))
+        end
+        FileUtils.cp(File.join(Setting[:bootdisk_ipxe_dir], 'ipxe.lkrn'), File.join(wd, 'build', 'ipxe'))
+        File.open(File.join(wd, 'build', 'script'), 'w') { |file| file.write(opts[:ipxe]) }
       end
 
-      FileUtils.cp(File.join(Setting[:bootdisk_syslinux_dir], 'isolinux.bin'), File.join(wd, 'build', 'isolinux.bin'))
-      FileUtils.cp(File.join(Setting[:bootdisk_ipxe_dir], 'ipxe.lkrn'), File.join(wd, 'build', 'ipxe'))
-      File.open(File.join(wd, 'build', 'script'),'w') { |file| file.write(script) }
+      if opts[:files]
+        opts[:files].each do |bootfile_info|
+          for file, source in bootfile_info do
+            fetch(File.join(wd, 'build', file), source)
+          end
+        end if opts[:files].respond_to? :each
+      end
 
       iso = File.join(wd, 'output.iso')
-      unless system("#{Setting[:bootdisk_mkiso_command]} -o #{iso} -b isolinux.bin -c boot.cat -no-emul-boot -boot-load-size 4 -boot-info-table #{File.join(wd, 'build')}")
+      unless system("#{Setting[:bootdisk_mkiso_command]} -o #{iso} -iso-level 2 -b isolinux.bin -c boot.cat -no-emul-boot -boot-load-size 4 -boot-info-table #{File.join(wd, 'build')}")
         raise ::Foreman::Exception.new(N_("ISO build failed"))
       end
 
@@ -42,4 +79,53 @@ EOF
       yield iso
     end
   end
+
+  def self.token_expiry(host)
+    expiry = host.token.try(:expires)
+    return '' if Setting[:token_duration] == 0 || expiry.blank?
+    '_' + expiry.strftime('%Y%m%d_%H%M')
+  end
+
+  private
+
+  def self.fetch(path, uri)
+    dir = File.dirname(path)
+    FileUtils.mkdir_p(dir) unless File.exist?(dir)
+
+    use_cache = !!Setting[:bootdisk_cache_media]
+    write_cache = false
+    File.open(path, 'w') do |file|
+      file.binmode
+
+      if use_cache && !(contents = Rails.cache.fetch(uri, :raw => true)).nil?
+        Rails.logger.info("Retrieved #{uri} from local cache (use foreman-rake tmp:cache:clear to empty)")
+        file.write(contents)
+      else
+        Rails.logger.info("Fetching #{uri}")
+        write_cache = use_cache
+        uri = URI(uri)
+        Net::HTTP.start(uri.host, uri.port) do |http|
+          request = Net::HTTP::Get.new uri
+
+          http.request request do |response|
+            response.read_body do |chunk|
+              file.write chunk
+            end
+          end
+        end
+      end
+    end
+
+    if write_cache
+      Rails.logger.debug("Caching contents of #{uri}")
+      Rails.cache.write(uri, File.read(path), :raw => true)
+    end
+  end
+
+  # isolinux supports up to ISO 9660 level 2 filenames
+  def self.iso9660_filename(name)
+    dir  = File.dirname(name)
+    file = File.basename(name).upcase.tr_s('^A-Z0-9_', '_')[0..30]
+    dir == '.' ? file : File.join(dir.upcase.tr_s('^A-Z0-9_', '_')[0..30], file)
+  end
 end

data/app/views/foreman_bootdisk/disks/help.html.erb

@@ -17,6 +17,11 @@
     <%= _("Once chainloaded, the OS bootloader and installer are downloaded directly from the installation media configured in Foreman, and the provisioning script (kickstart/preseed) is downloaded from Foreman.") %>
   </p>
 
+  <h2><%= _('Full host image') %></h2>
+  <p>
+    <%= _('A variant of the per-host image which contains the OS bootloader embedded inside the disk.  This may be useful if chainloading fails on certain hardware, but has the downside that the image must be regenerated for any change in the OS, bootloader or templates.') %>
+  </p>
+
   <h2><%= _('Generic image') %></h2>
   <p>
     <%= _('Generic images are a reusable disk image that works for any host registered in Foreman.  It requires a basic DHCP and DNS service to function and contact the server, but does not require DHCP reservations or static IP addresses.') %>

data/config/routes.rb

@@ -4,6 +4,7 @@ ForemanBootdisk::Engine.routes.draw do
     get 'help', :on => :collection
     constraints(:id => /[^\/]+/) do
       get 'hosts/:id', :on => :collection, :to => 'disks#host'
+      get 'full_hosts/:id', :on => :collection, :to => 'disks#full_host'
     end
   end
 

data/lib/foreman_bootdisk/engine.rb

@@ -32,7 +32,7 @@ module ForemanBootdisk
         requires_foreman '>= 1.6'
 
         security_block :bootdisk do |map|
-          permission :download_bootdisk, {:'foreman_bootdisk/disks' => [:generic, :host, :help],
+          permission :download_bootdisk, {:'foreman_bootdisk/disks' => [:generic, :host, :full_host, :help],
                                           :'foreman_bootdisk/api/v2/disks' => [:generic, :host]}
         end
 

data/lib/foreman_bootdisk/version.rb

@@ -1,3 +1,3 @@
 module ForemanBootdisk
-  VERSION = '3.1.2'
+  VERSION = '3.2.0'
 end

data/lib/tasks/bootdisk.rake

@@ -1,3 +1,5 @@
+require 'date'
+
 namespace :bootdisk do
   namespace :generate do
     desc 'Generate a static boot disk for a specific host.  NAME=fqdn, OUTPUT path'
@@ -5,18 +7,28 @@ namespace :bootdisk do
       host = Host::Base.find_by_name(ENV['NAME']) || raise("cannot find host '#{ENV['NAME']}', specify NAME=fqdn")
       tmpl = host.bootdisk_template_render
 
-      ForemanBootdisk::ISOGenerator.new(tmpl).generate do |image|
+      ForemanBootdisk::ISOGenerator.generate(:ipxe => tmpl) do |image|
         output = ENV['OUTPUT'] || "#{host.name}.iso"
         FileUtils.cp image, output
         puts "Wrote #{output}"
       end
     end
 
+    desc 'Generate a full boot disk for a specific host with the OS bootloader included.  NAME=fqdn, OUTPUT path'
+    task :full_host => :environment do
+      host = Host::Base.find_by_name(ENV['NAME']) || raise("cannot find host '#{ENV['NAME']}', specify NAME=fqdn")
+      ForemanBootdisk::ISOGenerator.generate_full_host(host) do |image|
+        output = ENV['OUTPUT'] || "#{host.name}_#{Date.today.strftime('%Y%m%d')}.iso"
+        FileUtils.cp image, output
+        puts "Wrote #{output}"
+      end
+    end
+
     desc 'Generate a generic boot disk.  OUTPUT=path'
     task :generic => :environment do
       tmpl = ForemanBootdisk::Renderer.new.generic_template_render
 
-      ForemanBootdisk::ISOGenerator.new(tmpl).generate do |image|
+      ForemanBootdisk::ISOGenerator.generate(:ipxe => tmpl) do |image|
         output = ENV['OUTPUT'] || "bootdisk_#{URI.parse(Setting[:foreman_url]).host}.iso"
         FileUtils.cp image, output
         puts "Wrote #{output}"

data/locale/de/foreman_bootdisk.po

@@ -3,15 +3,16 @@
 # This file is distributed under the same license as foreman_bootdisk.
 # 
 # Translators:
+# Ettore Atalan <atalanttore@googlemail.com>, 2014
 # Paul Puschmann, 2014
 # simon11 <simon.stieger.98@live.de>, 2014
 msgid ""
 msgstr ""
-"Project-Id-Version: foreman_bootdisk 3.1.1\n"
+"Project-Id-Version: foreman_bootdisk 3.1.2\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-08-08 13:53+0100\n"
-"PO-Revision-Date: 2014-08-09 08:59+0000\n"
-"Last-Translator: Lukáš Zapletal\n"
+"POT-Creation-Date: 2014-09-21 15:30+0100\n"
+"PO-Revision-Date: 2014-09-22 11:21+0000\n"
+"Last-Translator: Ettore Atalan <atalanttore@googlemail.com>\n"
 "Language-Team: German (http://www.transifex.com/projects/p/foreman/language/de/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -19,34 +20,65 @@ msgstr ""
 "Language: de\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
+msgid ""
+"A variant of the per-host image which contains the OS bootloader embedded "
+"inside the disk.  This may be useful if chainloading fails on certain "
+"hardware, but has the downside that the image must be regenerated for any "
+"change in the OS, bootloader or templates."
+msgstr ""
+
+msgid ""
+"All images are usable as either ISOs or as disk images, including being "
+"written to a USB disk with `dd`."
+msgstr ""
+
+msgid "Back"
+msgstr "Zurück"
+
 msgid "Boot disk"
-msgstr "Boot disk"
+msgstr "Startmedium"
 
 msgid "Boot disks"
-msgstr ""
+msgstr "Startmedien"
 
 msgid ""
 "Bootdisk is not supported with safemode rendering, please disable "
 "safemode_render under Adminster>Settings"
-msgstr "Bootdisk mit Safemode-Abbildung wird nicht unterstützt, bitte deaktiviere safemode_render unter Verwalten > Einstellungen"
+msgstr "Startmedium mit Safemode-Abbildung wird nicht unterstützt, bitte deaktiviere safemode_render unter Verwalten > Einstellungen"
 
 msgid "Command to generate ISO image, use genisoimage or mkisofs"
-msgstr "Kommando zur Erstellung von ISO-Images, verwende genisoimage oder mkisofs"
+msgstr "Kommando zur Erstellung von ISO-Abbildern, verwende genisoimage oder mkisofs"
 
 msgid "Download generic image"
-msgstr ""
+msgstr "Generisches Abbild herunterladen"
 
 msgid "Download host image"
-msgstr ""
+msgstr "Host-Abbild herunterladen"
 
 msgid "Failed to render boot disk template: %s"
-msgstr "Fehler beim Abbilden der Bootdisk-Vorlage: %s"
+msgstr "Fehler beim Abbilden der Startmedium-Vorlage: %s"
+
+msgid "Full host '%s' image"
+msgstr "Vollständiges Host \"%s\"-Abbild"
+
+msgid "Full host image"
+msgstr "Vollständiges Host-Abbild"
 
 msgid "Generic image"
-msgstr "Generisches Image"
+msgstr "Generisches Abbild"
+
+msgid ""
+"Generic images are a reusable disk image that works for any host registered "
+"in Foreman.  It requires a basic DHCP and DNS service to function and "
+"contact the server, but does not require DHCP reservations or static IP "
+"addresses."
+msgstr ""
+
+msgid "Help"
+msgstr "Hilfe"
 
 msgid "Host '%s' image"
-msgstr "Host '%s' Image"
+msgstr "Host '%s'-Abbild"
 
 msgid "Host has no IP address defined"
 msgstr "Host hat keine IP-Adresse definiert"
@@ -57,20 +89,42 @@ msgstr "Host hat keine Domäne definiert"
 msgid "Host has no subnet defined"
 msgstr "Host hat kein Subnetz definiert"
 
+msgid "Host image"
+msgstr "Host-Abbild"
+
+msgid "Host is not in build mode, so the template cannot be rendered"
+msgstr ""
+
 msgid "ISO build failed"
 msgstr "ISO-Erstellung fehlgeschlagen"
 
 msgid "ISO hybrid conversion failed"
 msgstr "ISO hybrid Konvertierung fehlgeschlagen"
 
+msgid "Installation media files will be cached for full host images"
+msgstr ""
+
+msgid ""
+"Once chainloaded, the OS bootloader and installer are downloaded directly "
+"from the installation media configured in Foreman, and the provisioning "
+"script (kickstart/preseed) is downloaded from Foreman."
+msgstr ""
+
 msgid "Path to directory containing iPXE images"
-msgstr "Pfad zum Verzeichnis mit iPXE Images"
+msgstr "Pfad zum Verzeichnis mit iPXE-Abbildern"
 
 msgid "Path to directory containing syslinux images"
-msgstr "Pfad zum Verzeichnis mit syslinux Images"
+msgstr "Pfad zum Verzeichnis mit syslinux-Abbildern"
+
+msgid ""
+"Per-host images contain data about a particular host registered in Foreman "
+"and set up fully static networking, avoiding the requirement for DHCP.  "
+"After networking is configured, they chainload from Foreman, picking up the "
+"current OS configuration and build state from the server."
+msgstr ""
 
 msgid "Please ensure the ipxe-bootimgs and syslinux packages are installed."
-msgstr "Bitte stelle sicher, dass die Pakete ipxe-bootimgs und syslinux installiert sind."
+msgstr "Bitte stellen Sie sicher, dass die Pakete ipxe-bootimgs und syslinux installiert sind."
 
 msgid ""
 "Plugin for Foreman that creates iPXE-based boot disks to provision hosts "
@@ -83,11 +137,30 @@ msgstr "Subnetz (%s) hat keinen Gateway definiert"
 msgid "Subnet (%s) has no primary DNS server defined"
 msgstr "Subnetz (%s) hat keinen primären DNS-Server definiert"
 
+msgid ""
+"The OS install continues using the installation media configured in Foreman,"
+" and it will typically configure static networking, depending on how the OS "
+"iPXE template is configured."
+msgstr ""
+
+msgid "True for full, false for basic reusable image"
+msgstr ""
+
 msgid "Unable to find template specified by %s setting"
 msgstr "Konnte Vorlage mit der %s-Einstellung nicht finden"
 
+msgid "Unable to generate disk template: %s"
+msgstr ""
+
+msgid ""
+"Various types of boot disks can be created to provision hosts without the "
+"need for PXE services.  Boot disks can be attached to the host (physical or "
+"virtual) which boots from the disk, contacts Foreman and begins the OS "
+"installation."
+msgstr ""
+
 msgid "iPXE template to use for generic host boot disks"
-msgstr "iPXE Vorlage zur Verwendung für generische host boot disks"
+msgstr "iPXE Vorlage zur Verwendung für generische Host-Startmedien"
 
 msgid "iPXE template to use for host-specific boot disks"
-msgstr "iPXE Vorlage zur Verwendung für host-spezifische boot disks"
+msgstr "iPXE Vorlage zur Verwendung für Host-spezifische Startmedien"