foreman_bootdisk 8.0.1 → 8.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4ecc018ff9fc843eed00c29113ffacd3b5f41748
-  data.tar.gz: 1b66b121c941e1920c209fa8150dfaf7bb352473
+  metadata.gz: 4e4edcf1bef7cac12fd6dfc3126c56d38dd40fcc
+  data.tar.gz: d567eaaf000f3de41b406d377e48309f84d00de1
 SHA512:
-  metadata.gz: 35e336d9aedce269030d034096488dbca617a07f3ef69e4525b70a1bfd86881e50d5c7d8a81f01b72295aee440feaab06c7c51e00446b15c0bd39fa5cf7ffedc
-  data.tar.gz: ef28b6dab07c4a17838a41818bc8e2fde706ffb0c0e63022790760aa9349fcc7cf7ef35ae3af7adfa6b6df9f5354b198fbfabcea5a29af214d7b7ea02c757c4b
+  metadata.gz: 4261cb941f1a326bc0212fceb800a2791275e1cb48bf1c31a072be194b82272af998e43f459b9ba1e5a1d5c61fac1b7851d2f10b4cf11b95b86e96c3e8424fa3
+  data.tar.gz: 72f9f11d227df4e5e665e0e9f54b5b7a4fe409097d68c1654ff3b740fb445bfd5b1a9b44039ba82f422e69ab65ad850b5f9dc4052b38472370b680117db90c61

data/CHANGES.md

@@ -1,5 +1,9 @@
 # Changelog
 
+## v8.0.2
+* fix truncation of filenames with suffixes for ISO9660
+* replace deprecated pxe_render call for Foreman 1.14
+
 ## v8.0.1
 * translate setting names
 * use dropdown menus for template settings (#14948)

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

@@ -14,7 +14,7 @@ module ForemanBootdisk::HostExt
 
   def bootdisk_template_render
     @host = self
-    pxe_render(bootdisk_template.template)
+    unattended_render(bootdisk_template.template)
   end
 
   def bootdisk_chain_url(mac = self.mac, action = 'iPXE')

data/app/services/foreman_bootdisk/iso_generator.rb

@@ -20,8 +20,7 @@ class ForemanBootdisk::ISOGenerator
     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
+        iso_f0 = iso9660_filename(f[0].to_s + '_' + suffix)
         tmpl.gsub!(f[0].to_s + '-' + suffix, iso_f0)
         ForemanBootdisk.logger.debug("Boot file #{iso_f0}, source #{f[1]}")
         [iso_f0, f[1]]
@@ -134,7 +133,7 @@ class ForemanBootdisk::ISOGenerator
   # 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)
+    file = File.basename(name).upcase.tr_s('^A-Z0-9_', '_').last(28)
+    dir == '.' ? file : File.join(dir.upcase.tr_s('^A-Z0-9_', '_').last(28), file)
   end
 end

data/lib/foreman_bootdisk/version.rb

@@ -1,3 +1,3 @@
 module ForemanBootdisk
-  VERSION = '8.0.1'
+  VERSION = '8.0.2'
 end

metadata

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