foreman_bootdisk 2.0.0 → 2.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: efc889edd64e77c31e018006515a86f9cdd68b58
-  data.tar.gz: 48185eb7638eab87a12853792dd2fc226e6adcb0
+  metadata.gz: 93c51e52b750e4913f2733baea4ab7a45521360e
+  data.tar.gz: c336a695f574ac6e8f6cb8cfeb9b1a04dc31bbb8
 SHA512:
-  metadata.gz: 1341fd44db6ff7d68060bd6129eef80fb50d4e530ba730f93d14c7cf3dcb05e5686b6485605fef25df036e41ffe30bb73253cd6c90dd2db53df8b5edc7d42852
-  data.tar.gz: 9abfa6c19bdc36bdc67c865a6867be88c2b8a625948ed6948db977e1cb832bc1d5efee537c64077775a0ba4fbf870d2f341df72799852ad4cb6ce8467e9d1650
+  metadata.gz: 439e5ed6f401fd360a0e8e8d4f7f4b663f8c716e89fa729de915c62e44a05dad9ef7679a76ecc6fb4b4f5c30ffe4b5387b20e2567212113a813791a1798a2819
+  data.tar.gz: 08fad9a3fcd01e8192a39533bc1a6da3a7f41d7d3be4b29aa00eb3533a8b3812c9c39958181cb99b3b248ed106f6990849f921459f0eae049bbce4c6977409a6

data/CHANGES.md

@@ -1,5 +1,9 @@
 # Changelog
 
+## v2.0.1
+* use genisoimage instead of mkisofs by default, added setting to control
+* fix translation extraction of setting descriptions
+
 ## v2.0.0
 * compatible with Foreman 1.4 (only), uses new plugin registration system
 * add validation of host and subnet data to host template

data/README.md

@@ -15,8 +15,8 @@ Please see the Foreman wiki for appropriate instructions:
 
 * [Foreman: How to Install a Plugin](http://projects.theforeman.org/projects/foreman/wiki/How_to_Install_a_Plugin)
 
-The gem name is "foreman_bootdisk".  Run `foreman-rake db:migrate` after
-installation.
+The gem name is "foreman_bootdisk".  Run `foreman-rake db:migrate`,
+`foreman-rake db:seed` after installation.
 
 RPM users can install the "ruby193-rubygem-foreman_bootdisk" or
 "rubygem-foreman_bootdisk" packages.
@@ -25,7 +25,7 @@ RPM users can install the "ruby193-rubygem-foreman_bootdisk" or
 
 * iPXE images are required
 * syslinux is required
-* mkisofs and isohybrid are required
+* genisoimage/mkisofs and isohybrid are required
 
 gPXE images are unsupported due to lack of initrd support.
 
@@ -46,6 +46,7 @@ Some configuration is set under Administer>Settings>Bootdisk in the Foreman UI.
 * `bootdisk_syslinux_dir` points to the directory containing syslinux images
 * `bootdisk_host_template` is the name of the per-host boot disk template
 * `bootdisk_generic_host_template` is the name of the generic boot disk template
+* `bootdisk_mkiso_command` is the name of genisoimage/mkisofs on your OS
 
 For per-host images, ensure host IP addresses and subnets are populated, and
 the subnet's gateway, subnet mask and DNS resolver(s) are correctly configured

data/app/models/setting/bootdisk.rb

@@ -8,10 +8,11 @@ class Setting::Bootdisk< ::Setting
 
     Setting.transaction do
       [
-        self.set('bootdisk_ipxe_dir', _('Path to directory containing iPXE images'), ipxe),
-        self.set('bootdisk_syslinux_dir', _('Path to directory containing syslinux images'), syslinux),
-        self.set('bootdisk_host_template', _('iPXE template to use for host-specific boot disks'), 'Boot disk iPXE - host'),
-        self.set('bootdisk_generic_host_template', _('iPXE template to use for generic host boot disks'), 'Boot disk iPXE - generic host'),
+        self.set('bootdisk_ipxe_dir', N_('Path to directory containing iPXE images'), ipxe),
+        self.set('bootdisk_syslinux_dir', N_('Path to directory containing syslinux images'), syslinux),
+        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'),
       ].compact.each { |s| self.create s.update(:category => "Setting::Bootdisk") }
     end
 

data/app/services/bootdisk/iso_generator.rb

@@ -1,6 +1,6 @@
 # Generates an iPXE ISO hybrid image
 #
-# requires syslinux, ipxe/ipxe-bootimgs, mkisofs, isohybrid
+# requires syslinux, ipxe/ipxe-bootimgs, genisoimage, isohybrid
 class Bootdisk::ISOGenerator
   attr_reader :script
 
@@ -30,7 +30,7 @@ EOF
       File.open(File.join(wd, 'build', 'script'),'w') { |file| file.write(script) }
 
       iso = File.join(wd, 'output.iso')
-      unless system("mkisofs -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} -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
 

data/lib/bootdisk/version.rb

@@ -1,3 +1,3 @@
 module Bootdisk
-  VERSION = '2.0.0'
+  VERSION = '2.0.1'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: foreman_bootdisk
 version: !ruby/object:Gem::Version
-  version: 2.0.0
+  version: 2.0.1
 platform: ruby
 authors:
 - Dominic Cleal
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-01-22 00:00:00.000000000 Z
+date: 2014-02-13 00:00:00.000000000 Z
 dependencies: []
 description: Plugin for Foreman that creates iPXE-based boot disks to provision hosts
   without the need for PXE infrastructure.
@@ -55,17 +55,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.6
+rubygems_version: 2.2.1
 signing_key: 
 specification_version: 4
 summary: Create boot disks to provision hosts with Foreman