foreman_bootdisk 1.2.1 → 1.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8a87816866ed51776fc4c8ac41dda8c95ba54af3
-  data.tar.gz: 109d8a3cda12ef381176764b44995695c5bd4497
+  metadata.gz: 0e7ca62988c19718f543895b4428bb0700334cbc
+  data.tar.gz: 31bf9786b3162c9b92e2c90c3fb0c91339b26831
 SHA512:
-  metadata.gz: f1a26019f843ce8b8aa63ecfd5ffe4903924838e992c6e1f18e802412e7a1cf0ced908b6aa5620ce82018b399eadf93874d6251a89cbd2f230e2d02bceeea42e
-  data.tar.gz: 614523701c49a45f4c6bad05aa10ee699a97aed34cb35e105282c5082e354cd5a070d05d72787c936adeb9b9451076c43b3a4209aa9a9eb235d8fd721216b0ee
+  metadata.gz: d350499749f54362a32c3ba1497c6eda779c19cfc97f127110568a040389d6aafddde5c37cfdc0f7d657114e89a10daf705e355ef718e625728f9439bec50b0e
+  data.tar.gz: 362c580e40e8a2c4201f170a6489ce97af0181cb24ddd3c1760dbc55edfc10d9d20dd994e12670f155d0c8c6932cb56eb699a1e29512fc16f3908d43ff0a71e9

data/CHANGES.md

@@ -1,5 +1,9 @@
 # Changelog
 
+## v1.2.2
+* check ipxe/syslinux are present when generating images (#3195)
+* fix RHN_PROVISIONING_MAC_0 error on template retrieval
+
 ## v1.2.1
 * add permission and default role for non-admin users
 * fix DB migration from clean install

data/app/controllers/concerns/bootdisk/unattended_controller_ext.rb

@@ -6,7 +6,7 @@ module Bootdisk::UnattendedControllerExt
   end
 
   def find_host_by_ip_or_mac_with_param_mac
-    request.env['HTTP_X_RHN_PROVISIONING_MAC_0'] = "unknown #{params['mac']}" unless request.env.has_key?('HTTP_X_RHN_PROVISIONING_MAC_0')
+    request.env['HTTP_X_RHN_PROVISIONING_MAC_0'] = "unknown #{params['mac']}" unless request.env.has_key?('HTTP_X_RHN_PROVISIONING_MAC_0') || params['mac'].nil?
     find_host_by_ip_or_mac_without_param_mac
   end
 end

data/app/services/bootdisk/iso_generator.rb

@@ -20,6 +20,11 @@ initrd /script
 EOF
       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."))
+      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) }

data/lib/bootdisk/version.rb

@@ -1,3 +1,3 @@
 module Bootdisk
-  VERSION = '1.2.1'
+  VERSION = '1.2.2'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: foreman_bootdisk
 version: !ruby/object:Gem::Version
-  version: 1.2.1
+  version: 1.2.2
 platform: ruby
 authors:
 - Dominic Cleal
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-09-24 00:00:00.000000000 Z
+date: 2013-10-07 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.